Procházet zdrojové kódy

1、修复归档后生成发布节点错误;
2、修复发布后生成的回访节点错误;
3、二次办理审批通过后即将超期时间从审批通过的时间开始计算;

Dun.Jason před 4 měsíci
rodič
revize
ea76dfbc3c

+ 1 - 1
src/Hotline.Api/Hotline.Api.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Mapster.DependencyInjection" Version="1.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.10" />
-    <PackageReference Include="MiniExcel" Version="1.34.2" />
+    <PackageReference Include="MiniExcel" Version="1.36.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
     <PackageReference Include="Serilog.Sinks.MongoDB" Version="6.0.0" />

+ 2 - 6
src/Hotline.Application/Orders/OrderSecondaryHandlingApplication.cs

@@ -182,12 +182,8 @@ namespace Hotline.Application.Orders
                 };
                 var reTransactNum = order.ReTransactNum is null ? 1 : order.ReTransactNum + 1;
                 //var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
-                var startTime = DateTime.Now;
-                if (order.CenterToOrgTime.HasValue)
-                {
-                    startTime = order.CenterToOrgTime.Value;
-                }
-                var expiredTime = await _expireTime.CalcEndTime(DateTime.Now,startTime, order.AcceptTypeCode);
+                
+                var expiredTime = await _expireTime.CalcEndTime(DateTime.Now,DateTime.Now, order.AcceptTypeCode);
                 var processType = step.FlowDirection == EFlowDirection.OrgToCenter || step.FlowDirection == EFlowDirection.CenterToCenter ? EProcessType.Zhiban : EProcessType.Jiaoban;
                 var isOrderFiled = order.Status >= EOrderStatus.Filed;
                 await _orderRepository.Updateable().SetColumns(o => new Order() { ExpiredTime = expiredTime.ExpiredTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime, NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne, ReTransactNum = reTransactNum, ProcessType = processType, Status = EOrderStatus.Handling })

+ 1 - 1
src/Hotline.Share/Dtos/Order/Detail/OrderFlowTraceDto.cs

@@ -112,7 +112,7 @@ public class OrderFlowTraceDto
     /// <summary>
     /// 发布范围
     /// </summary>
-    public bool PublishState { get; set; }
+    public bool? PublishState { get; set; }
 
     /// <summary>
     /// 整理结果

+ 2 - 1
src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -3242,6 +3242,7 @@ namespace Hotline.FlowEngine.Workflows
             pubTrace.HandlerOrgAreaCode = null;
             pubTrace.HandlerOrgAreaName = null;
             pubTrace.StepExpiredTime = null;
+            pubTrace.HandleTime = null;
 
             pubTrace.CreationTime = endTrace.CreationTime.AddSeconds(1);
             await _workflowTraceRepository.AddAsync(pubTrace, cancellation);
@@ -3270,7 +3271,7 @@ namespace Hotline.FlowEngine.Workflows
             visitTrace.AssignerOrgId = pubTrace.HandlerOrgId;
             visitTrace.AssignerOrgName = pubTrace.HandlerOrgName;
             visitTrace.AssignerOrgIsCenter = pubTrace.HandlerOrgIsCenter ?? false;
-
+            visitTrace.HandleTime = null;
             visitTrace.AcceptorId = acceptor.UserId;
             visitTrace.AcceptorName = acceptor.UserName;
             visitTrace.AcceptorOrgId = acceptor.OrgId;