src/DataSharing.Application/Mappers/MapperConfigs.cs

@@ -150,7 +150,7 @@ namespace DataSharing.Application.Mappers
             config.ForType<OrderFlowDto, SubmitCaseResultInfo>()
            .Map(d => d.CaseSerial, x => x.Order.ProvinceNo)
            .Map(d => d.DeptName, x => x.Order.ActualHandleOrgName)
-           .Map(d => d.FinishTime, x => x.Order.ActualHandleTime)
+           .Map(d => d.FinishTime, x => x.Order.FiledTime)
            .Map(d => d.FinishName, x => x.Order.ActualHandlerName)
            .Map(d => d.FinishNote, x => x.Order.ActualOpinion)
            .Map(d => d.EndDept, x => x.Order.ActualHandleOrgName)
@@ -163,7 +163,7 @@ namespace DataSharing.Application.Mappers
            .Map(d => d.SignTimeBf, x => x.Order.ExpiredTime)
            .Map(d => d.SignTime, x => x.Order.ActualHandleStepAcceptTime)
            .Map(d => d.FdBackTimeBf, x => x.Order.ExpiredTime)
-           .Map(d => d.FdBackTime, x => x.Order.ActualHandleTime)
+           .Map(d => d.FdBackTime, x => x.Order.FiledTime)
            .Map(d => d.HandleTimeLong, x => x.Order.ProcessType == Hotline.Share.Enums.Order.EProcessType.Zhiban ? x.Order.CreationTimeHandleDurationWorkday : x.Order.CenterToOrgHandleDurationWorkday)
              ;
 
@@ -171,7 +171,7 @@ namespace DataSharing.Application.Mappers
             config.ForType<OrderDto, GetCaseResultReceiveInfo>()
            .Map(d => d.CaseSerial, x => x.ProvinceNo)
            .Map(d => d.DeptName, x => x.ActualHandleOrgName)
-           .Map(d => d.FinishTime, x => x.ActualHandleTime)
+           .Map(d => d.FinishTime, x => x.FiledTime)
            .Map(d => d.FinishName, x => x.ActualHandlerName)
            .Map(d => d.FinishNote, x => x.ActualOpinion)
            .Map(d => d.EndDept, x => x.ActualHandleOrgName)
@@ -182,7 +182,7 @@ namespace DataSharing.Application.Mappers
            .Map(d => d.EndAreaCode, x => string.IsNullOrEmpty(x.ActualHandleOrgAreaCode) == false ? x.ActualHandleOrgAreaCode : x.AreaCode.Substring(0, 6))
            // .Map(d => d.EndAreaName, x => string.IsNullOrEmpty(x.ActualHandleOrgAreaName) == false ? x.ActualHandleOrgAreaName : "宜宾市")
            .Map(d => d.SignTime, x => x.ActualHandleStepAcceptTime)
-           .Map(d => d.FdBackTime, x => x.ActualHandleTime)
+           .Map(d => d.FdBackTime, x => x.FiledTime)
            .Map(d => d.HandleTimeLong, x => x.HandleDurationWorkday)
             ;
 

src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -832,7 +832,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                        PathType = p.PathType,
                        GenerationTime = p.GenerationTime,
                        CreationTime = p.CreationTime,
-                       IsSuccess = p.IsSuccess
+                       IsSuccess = p.IsSuccess,
+                       ExpiredTime= p.ExpiredTime
                    })
                     .MergeTable()
                     .OrderByDescending(p => p.CreationTime)
@@ -924,7 +925,9 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                          PathType = p.PathType,
                          GenerationTime = p.GenerationTime,
                          CreationTime = p.CreationTime,
-                         IsSuccess = p.IsSuccess
+                         IsSuccess = p.IsSuccess,
+                         ExpiredTime    = p.ExpiredTime,
+                         FiledTime=p.FiledTime
                      })
                     .OrderByDescending(p => p.CreationTime)
                     .MergeTable().ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);

src/DataSharing.Share/Dtos/HotlineWeb/DsSendTaskDto.cs

@@ -184,11 +184,43 @@ namespace DataSharing.Share.Dtos.HotlineWeb
     /// </summary>
     public class DsEndSendTaskDto : DsSendTaskDto
     {
+        /// <summary>
+        /// 期满时间
+        /// </summary>
+        public DateTime? ExpiredTime { get; set; }
+
+        /// <summary>
+        /// 办结时间
+        /// </summary>
+        public DateTime? FiledTime { get; set; }
+
+        /// <summary>
+        /// 是否超期
+        /// </summary>
+        public string? IsOverdueText { get; set; }
+
         /// <summary>
         /// 推送状态
         /// </summary>
         public ESendTaskState IsSuccess { get; set; } = ESendTaskState.WaitPush;
 
         public string IsSuccesseText => IsSuccess.GetDescription();
+
+        /// <summary>
+        /// 计算是否超期
+        /// </summary>
+        /// <returns></returns>
+        public void CalcIsOverdue()
+        {
+            //计算是否超期
+            if (ExpiredTime.HasValue)
+            {
+                if (FiledTime.HasValue)
+                    IsOverdueText = FiledTime > ExpiredTime ? "超期" : "未超期";
+                else
+                    IsOverdueText = DateTime.Now > ExpiredTime ? "超期" : "未超期";
+            }
+
+        }
     }
 }

src/DataSharing/Province/SendTask/SubmitCaseInfo/DsSendTaskSubmitCaseInfo.cs

@@ -21,5 +21,11 @@ namespace DataSharing.Province.SendTask.SubmitCaseInfo
         /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(Id))]
         public DsWaitSendTaskSubmitCaseInfo WaitSendTaskSubmitCaseInfo { get; set; }
+
+        /// <summary>
+        /// 期满时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "期满时间")]
+        public DateTime? ExpiredTime { get; set; }
     }
 }

src/DataSharing/Province/SendTask/SubmitCaseInfo/DsWaitSendTaskSubmitCaseInfo.cs

@@ -15,5 +15,11 @@ namespace DataSharing.Province.SendTask.SubmitCaseInfo
         /// </summary>
         [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true, ColumnDescription = "组装参数")]
         public Share.Dtos.Province.HuiJu.SubmitCaseInfo RequestData { get; set; }
+
+        /// <summary>
+        /// 期满时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "期满时间")]
+        public DateTime? ExpiredTime { get; set; }
     }
 }

src/DataSharing/Province/SendTask/SubmitCaseResult/DsSendTaskSubmitCaseResult.cs

@@ -21,5 +21,23 @@ namespace DataSharing.Province.SendTask.SubmitCaseResult
         /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(Id))]
         public DsWaitSendTaskSubmitCaseResult WaitSendTaskSubmitCaseResult { get; set; }
+
+        /// <summary>
+        /// 期满时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "期满时间")]
+        public DateTime? ExpiredTime { get; set; }
+
+        /// <summary>
+        /// 办结时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "办结时间")]
+        public DateTime? FiledTime { get; set; }
+
+        /// <summary>
+        /// 是否超期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否超期")]
+        public bool? IsOverdue { get; set; }
     }
 }

src/DataSharing/Province/SendTask/SubmitCaseResult/DsWaitSendTaskSubmitCaseResult.cs

@@ -15,5 +15,18 @@ namespace DataSharing.Province.SendTask.SubmitCaseResult
         /// </summary>
         [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true, ColumnDescription = "组装参数")]
         public Share.Dtos.Province.HuiJu.SubmitCaseResultInfo RequestData { get; set; }
+
+        /// <summary>
+        /// 期满时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "期满时间")]
+        public DateTime? ExpiredTime { get; set; }
+
+        /// <summary>
+        /// 办结时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "办结时间")]
+        public DateTime? FiledTime { get; set; }
+
     }
 }

src/DataSharing/SendTask/InitPushDataService.cs

@@ -106,7 +106,8 @@ namespace DataSharing.SendTask
                 Request = request,
                 RequestData = requestData,
                 GenerationTime = generationTime,
-                PathType = EPathType.HuiJu
+                PathType = EPathType.HuiJu,
+                ExpiredTime = requestData.TfdBackTimeBf
             };
             waitTask.Id = await _waitSendTaskSubmitCaseInfoRepository.AddAsync(waitTask, cancellationToken);
 
@@ -203,8 +204,11 @@ namespace DataSharing.SendTask
                 Request = request,
                 RequestData = requestData,
                 GenerationTime = generationTime,
-                PathType = EPathType.HuiJu
+                PathType = EPathType.HuiJu,
+                ExpiredTime = requestData.FdBackTimeBf,
+                FiledTime = requestData.FinishTime
             };
+
             waitTask.Id = await _waitSendTaskSubmitCaseResultRepository.AddAsync(waitTask, cancellationToken);
             var sendTask = _mapper.Map<DsSendTaskSubmitCaseResult>(waitTask);
             sendTask.Id = waitTask.Id;