Merge branch 'dev_dss' of Fengwo/hotline into dev

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -236,8 +236,8 @@ namespace Hotline.Application.Subscribers
         {
             var order = await _orderRepository.Queryable().Where(x => x.ProvinceNo == dto.ProvinceScreenResult!.CaseSerial).FirstAsync(cancellationToken);
             var orderScreen = await _orderScreenRepository.Queryable().Where(x => x.OrderId == order.Id && x.Status == Share.Enums.Order.EScreenStatus.Approval).FirstAsync(cancellationToken);
-            await _workflowApplication.JumpToEndAsync(orderScreen.WorkflowId, "省上推送甄别结果", null, cancellationToken: cancellationToken);
-            orderScreen.Status = "1".Equals(dto.ProvinceScreenResult.AuditResult) ? Share.Enums.Order.EScreenStatus.End : Share.Enums.Order.EScreenStatus.Refuse;
+            await _workflowApplication.JumpToEndAsync(orderScreen.WorkflowId, "省上推送甄别结果", null,dto.ProvinceScreenResult.AuditResult? Share.Enums.FlowEngine.EReviewResult.Approval : Share.Enums.FlowEngine.EReviewResult.Failed , cancellationToken: cancellationToken);
+            orderScreen.Status = dto.ProvinceScreenResult.AuditResult ? Share.Enums.Order.EScreenStatus.End : Share.Enums.Order.EScreenStatus.Refuse;
             if (orderScreen.Status == Share.Enums.Order.EScreenStatus.End)
             {
                 var visitDetail = await _orderVisitedDetailRepository.GetAsync(orderScreen.VisitDetailId, cancellationToken);
@@ -489,13 +489,7 @@ namespace Hotline.Application.Subscribers
             {
                 //查询延期
                 var orderDelay = await _orderDelayRepository.GetAsync(x => x.OrderId == order.Id && x.DelayState == EDelayState.Examining, cancellationToken);
-                var workflow = await _workflowRepository.GetAsync(orderDelay.WorkflowId);
-                if (workflow != null)
-                {
-                    workflow.Complete(dto.IsPass ? Share.Enums.FlowEngine.EReviewResult.Approval : Share.Enums.FlowEngine.EReviewResult.Failed);
-                    await _workflowRepository.UpdateAsync(workflow, cancellationToken);
-                }
-                await _workflowApplication.JumpToEndAsync(orderDelay.WorkflowId, dto.Opinion, null);
+                await _workflowApplication.JumpToEndAsync(orderDelay.WorkflowId, dto.Opinion, null, dto.IsPass ? Share.Enums.FlowEngine.EReviewResult.Approval : Share.Enums.FlowEngine.EReviewResult.Failed);
             }
         }
 

src/Hotline.Share/Dtos/Order/OrderScreenDto.cs

@@ -236,7 +236,7 @@ namespace Hotline.Share.Dtos.Order
 		/// <summary>
 		/// 审核结果是否通过
 		/// </summary>
-		public string AuditResult { get; set; }
+		public bool AuditResult { get; set; }
 
 		/// <summary>
 		/// 审核意见