Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/WebPortalController.cs

@@ -919,8 +919,12 @@ namespace Hotline.Api.Controllers
         public async Task<OpenResponse> GetOrderDetailById([FromBody] ArticleIdDto dto)
         {
             var data = await _orderRepository.GetAsync(p => p.Id == dto.Id, HttpContext.RequestAborted);
-
             var orderDetail = _mapper.Map<OrderDetail>(data);
+            if (_appOptions.Value.IsZiGong)
+            {
+                orderDetail.FlowResult = "";
+            }
+
             if (data != null)
             {
                 //如果是省工单或者是省政民互动的工单，市民不能进行评价
@@ -936,7 +940,17 @@ namespace Hotline.Api.Controllers
                     orderDetail.PubFlag = "1";
                     orderDetail.FlowTitle = orderPublish.ArrangeTitle;
                     orderDetail.FlowContent = orderPublish.ArrangeContent;
-                    orderDetail.FlowResult = orderPublish.ArrangeOpinion;
+
+                    if (_appOptions.Value.IsZiGong)
+                    {
+                        if (data.Source == ESource.ProvinceStraight)
+                            orderDetail.FlowResult = orderPublish.ArrangeOpinion;
+                        if (data.Source != ESource.ProvinceStraight && data.Status >= EOrderStatus.Visited)
+                            orderDetail.FlowResult = orderPublish.ArrangeOpinion;
+                    }
+                    else
+                        orderDetail.FlowResult = orderPublish.ArrangeOpinion;
+
                     if (orderPublish.PublishState)
                         orderDetail.FlowPubFlagName = "公开";
                 }

src/Hotline.Api/StartupExtensions.cs

@@ -201,7 +201,7 @@ internal static class StartupExtensions
         services.AddMq(configuration);
 
         //job
-        //services.RegisterJob(appConfiguration);
+        services.RegisterJob(appConfiguration);
 
         services.AddPdfManager();
 

src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -232,9 +232,9 @@ public class OrderMapperConfigs : IRegister
             .Map(d => d.No, s => s.CaseSerial);
 
         config.ForType<WorkflowTrace, OrderFlowTraceDto>()
-            .IgnoreIf((s, d) => s.Status < EWorkflowStepStatus.Handled, d => d.HandlerName)
-            .IgnoreIf((s, d) => s.Status < EWorkflowStepStatus.Handled, d => d.HandlerOrgName)
-            .IgnoreIf((s, d) => s.Status < EWorkflowStepStatus.Handled, d => d.HandleTime)
+            //.IgnoreIf((s, d) => s.Status < EWorkflowStepStatus.Handled, d => d.HandlerName)
+            //.IgnoreIf((s, d) => s.Status < EWorkflowStepStatus.Handled, d => d.HandlerOrgName)
+            //.IgnoreIf((s, d) => s.Status < EWorkflowStepStatus.Handled, d => d.HandleTime)
 
             .IgnoreIf((s, d) => s.TraceStyle != ETraceStyle.Publish || s.OrderPublish == null, d => d.PublishState)
             .Map(d => d.PublishState, s => s.OrderPublish.PublishState)

src/Hotline.Share/Dtos/Snapshot/IndustryDto.cs

@@ -210,7 +210,9 @@ public record IndustryCaseItemInDto(string? CaseName, string? IndustryName) : Pa
 public class SystemWebPageInDto
 {
     /// <summary>
-    /// 页面类型
+    /// 页面类型;
+    /// 1: 正常;
+    /// 2: 关怀;
     /// </summary>
     [Required]
     public EPageType PageType { get; set; }

src/Hotline/CallCenter/Calls/TelActionRecord.cs

@@ -8,7 +8,7 @@ using XF.Domain.Repository;
 
 namespace Hotline.CallCenter.Calls
 {
-    public class TelActionRecord: CreationEntity
+    public class TelActionRecord : CreationEntity
     {
         /// <summary>
         /// 用户ID
@@ -48,24 +48,24 @@ namespace Hotline.CallCenter.Calls
         /// <summary>
         /// 用时
         /// </summary>
-        
+
         public double Duration { get; private set; }
 
         public TelActionRecord()
         {
-            
+
         }
 
-        public TelActionRecord(string userId,string userName,string telNo,string queueId,EActionType actionType)
+        public TelActionRecord(string userId, string userName, string telNo, string queueId, EActionType actionType)
         {
-            UserId = userId;UserName = userName;TelNo = telNo;QueueId = queueId;ActionType = actionType;StartTime = DateTime.Now;
+            UserId = userId; UserName = userName; TelNo = telNo; QueueId = queueId; ActionType = actionType; StartTime = DateTime.Now;
         }
 
 
         public void EndAction()
         {
             EndTime = DateTime.Now;
-            Duration = (EndTime.Value - StartTime).TotalSeconds;
+            Duration = Math.Round(((double)(EndTime.Value - StartTime).TotalSeconds), 2);
         }
     }
 }