Dun.Jason hace 1 año
padre
commit
096445326d
Se han modificado 1 ficheros con 18 adiciones y 13 borrados
  1. 18 13
      src/Hotline.Api/Controllers/OrderController.cs

+ 18 - 13
src/Hotline.Api/Controllers/OrderController.cs

@@ -2309,20 +2309,25 @@ public class OrderController : BaseController
 
         try
         {
-            //if (dto.Workflow.NextHandlers.Any(d => d.Key == "001170" || d.Key == "001177"))
-            //{
-            //    var s = _timeLimitDomainService.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 45, 80);
-            //    var n = new ExpiredTimeWithConfig
-            //    {
-            //        Count = s.
-            //    }
-            //}
+            var expiredTimeConfig = new ExpiredTimeWithConfig();
+            if (dto.Workflow.NextHandlers.Any(d => d.Key == "001170" || d.Key == "001177"))
+            {
+                var s = _timeLimitDomainService.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 45, 80);
+                expiredTimeConfig = new ExpiredTimeWithConfig
+                {
+                    Count = 45,
+                    TimeType = ETimeType.WorkDay,
+                    TimeText = "45个工作日",
+                    ExpiredTime = s.EndTime,
+                    NearlyExpiredTime = s.NearlyExpiredTime
+                };
+            }
+            else
+            {
+                //期满时间
+                expiredTimeConfig = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.OrgToCenter, dto.Data.AcceptTypeCode);
+            }
             // if(dto.Workflow.HandlerType is EHandlerType.AssignedOrg or EHandlerType.OrgLevel or EHandlerType.OrgType && dto.Workflow.NextStepCode)
-
-
-            //期满时间
-            var expiredTimeConfig = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.OrgToCenter, dto.Data.AcceptTypeCode);
-
             var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
             startDto.DefinitionModuleCode = WorkflowModuleConsts.OrderHandle;
             startDto.Title = dto.Data.Title;