tangjiang 8 months ago
parent
commit
adac8cbb3c

+ 2 - 2
src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -926,8 +926,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                          GenerationTime = p.GenerationTime,
                          CreationTime = p.CreationTime,
                          IsSuccess = p.IsSuccess,
-                         ExpiredTime    = p.ExpiredTime,
-                         FiledTime=p.FiledTime
+                         FiledTime=p.FiledTime,
+                         ExpiredTime= SqlFunc.Subqueryable<DsSendTaskSubmitCaseInfo>().Where(s => s.ProvinceNo == p.ProvinceNo).OrderByDesc(s=>s.LastTime).Select(s => s.ExpiredTime)
                      })
                     .OrderByDescending(p => p.CreationTime)
                     .MergeTable().ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);

+ 0 - 11
src/DataSharing/Province/SendTask/SubmitCaseResult/DsSendTaskSubmitCaseResult.cs

@@ -22,22 +22,11 @@ namespace DataSharing.Province.SendTask.SubmitCaseResult
         [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; }
     }
 }

+ 0 - 6
src/DataSharing/Province/SendTask/SubmitCaseResult/DsWaitSendTaskSubmitCaseResult.cs

@@ -16,12 +16,6 @@ namespace DataSharing.Province.SendTask.SubmitCaseResult
         [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>

+ 0 - 1
src/DataSharing/SendTask/InitPushDataService.cs

@@ -205,7 +205,6 @@ namespace DataSharing.SendTask
                 RequestData = requestData,
                 GenerationTime = generationTime,
                 PathType = EPathType.HuiJu,
-                ExpiredTime = requestData.FdBackTimeBf,
                 FiledTime = requestData.FinishTime
             };