Merge branch 'test' into lib/test

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、判断工单属于哪种归档类型，需由谁归档来判断，热线中心归档的就叫中心归档件，部门归档就叫做部门归档件

src/Hotline.Application/OrderApp/Handlers/OrderDelayHandler/OrderDelayBatchReviewTaskCompetedHandler.cs

@@ -13,6 +13,7 @@ using Hotline.Orders;
 using Hotline.Share.Dtos.Article;
 using Hotline.Share.Enums.Article;
 using Hotline.Share.Enums.Order;
+using Microsoft.Extensions.Logging;
 using XF.Domain.Authentications;
 using XF.Domain.Repository;
 
@@ -26,15 +27,18 @@ public class OrderDelayBatchReviewTaskCompetedHandler : INotificationHandler<App
     private readonly IRepository<Apptask> _apptaskRepository;
     private readonly IOrderDelayRepository _orderDelayRepository;
     private readonly ICircularRecordDomainService _circularRecordDomainService;
+    private readonly ILogger<OrderDelayBatchReviewTaskCompetedHandler> _logger;
 
     public OrderDelayBatchReviewTaskCompetedHandler(
         IRepository<Apptask> apptaskRepository,
         IOrderDelayRepository orderDelayRepository,
-        ICircularRecordDomainService circularRecordDomainService)
+        ICircularRecordDomainService circularRecordDomainService,
+        ILogger<OrderDelayBatchReviewTaskCompetedHandler> logger)
     {
         _apptaskRepository = apptaskRepository;
         _orderDelayRepository = orderDelayRepository;
         _circularRecordDomainService = circularRecordDomainService;
+        _logger = logger;
     }
 
     /// <summary>Handles a notification</summary>
@@ -47,6 +51,7 @@ public class OrderDelayBatchReviewTaskCompetedHandler : INotificationHandler<App
         var apptask = await _apptaskRepository.Queryable()
             .Includes(d => d.ApptaskItems)
             .FirstAsync(d => d.Id == notification.ApptaskItem.ApptaskId, cancellationToken);
+        _logger.LogInformation("批量延期审批任务执行完毕：{name}", apptask.Name);
         var unSuccessItems = apptask.ApptaskItems
             .Where(d => d.TaskStatus != ETaskStatus.Succeeded)
             .ToList();

src/Hotline/BatchTask/ApptaskDomainService.cs

@@ -97,9 +97,8 @@ public class ApptaskDomainService : IApptaskDomainService, IScopeDependency
     public async Task<bool> IsCompletedAsync(string taskId, CancellationToken cancellation)
     {
         var anyUnCompleted = await _apptaskItemRepository.Queryable()
-            .AnyAsync(d => d.Tries < d.TryLimit
-                           && (d.TaskStatus == ETaskStatus.Waiting || d.TaskStatus == ETaskStatus.Processing)
-                           && d.ApptaskId == taskId, cancellation);
+            .AnyAsync(d => d.ApptaskId == taskId
+                && d.TaskEndTime == null, cancellation);
         return !anyUnCompleted;
     }
 
@@ -179,7 +178,7 @@ public class ApptaskDomainService : IApptaskDomainService, IScopeDependency
                 throw new UserFriendlyException($"任务参数反序列化失败, taskItemId: {apptaskItem.Id}");
 
             _sessionContextManager.ChangeSessionContext(request.SessionContext);
-            
+
             //if (request is IApptaskRequest reqWithSession)
             //    _sessionContextProvider.ChangeSession(reqWithSession.SessionContext);
             var result = await executor.ExecuteAsync(request, cancellation);

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()
                     .办理到一级部门()

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": {