xf 1 week ago
parent
commit
87c80f7b05

+ 4 - 2
src/Hotline.Application/Handlers/FlowEngine/WorkflowEndHandler.cs

@@ -204,7 +204,7 @@ public class WorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
                     order.FileUserOrgName = notification.Trace.HandlerOrgName;
                     order.FileOrgIsCenter = notification.Trace.HandlerOrgIsCenter;
                     order.FileOpinion = notification.Dto.Opinion;
-                    
+
                     /*
                      *需求:
                      *1、判断工单属于哪种归档类型,需由谁归档来判断,热线中心归档的就叫中心归档件,部门归档就叫做部门归档件
@@ -342,16 +342,18 @@ public class WorkflowEndHandler : INotificationHandler<EndWorkflowNotify>
                     var delay = await _orderDelayRepository.GetAsync(workflow.ExternalId, cancellationToken);
                     if (delay != null)
                     {
+                        _logger.LogInformation("延期流程结束, 工单编号: {no}", delay.No);
                         //delay.Flowed(workflow.FlowedUserIds, workflow.FlowedOrgIds, workflow.HandlerUsers, workflow.HandlerOrgs);
                         delay.DelayState = isReviewPass ? EDelayState.Pass : EDelayState.NoPass;
                         await _orderDelayRepository.Updateable(delay)
-                            .UpdateColumns(d => d.DelayState)
+                            .UpdateColumns(d => new { d.DelayState })
                             .ExecuteCommandAsync(cancellationToken);
                         if (isReviewPass)
                         {
                             //处理工单延期
                             await _orderApplication.DelayOrderExpiredTimeAsync(delay.OrderId, delay.DelayNum,
                                 delay.DelayUnit, delay.IsProDelay, cancellationToken);
+                            _logger.LogInformation("延期流程结束更新期满时间, 工单编号: {no}", delay.No);
                         }
                     }
                     break;

+ 1 - 1
test/Hotline.Tests/Controller/OrderDelayControllerTest.cs

@@ -80,7 +80,7 @@ namespace Hotline.Tests.Controller
             SetZuoXi();
 
             var delayIds = new List<string>();
-            for (int i = 0; i < 20; i++)
+            for (int i = 0; i < 10; i++)
             {
                 var order = _orderServiceMock.CreateOrder()
                     .办理到一级部门()

+ 2 - 2
test/Hotline.Tests/appsettings.Development.json

@@ -71,14 +71,14 @@
         }
     },
     "ConnectionStrings": {
-        "Hotline": "PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
+        "Hotline": "PORT=5432;DATABASE=hotline_test;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
         "CAP": "PORT=5432;DATABASE=fwmq;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;Search Path=cap"
     },
     "Cache": {
         "Host": "110.188.24.182",
         "Port": 50179,
         "Password": "fengwo123!$!$",
-        "Database": 3 //release:3, dev:5
+        "Database": 2 //release:3, dev:5
     },
     "Swagger": true,
     "Cors": {