Merge branch 'release' of http://git.12345lm.cn/Fengwo/hotline into release

src/Hotline.Api/Controllers/OrderController.cs

@@ -4275,7 +4275,7 @@ public class OrderController : BaseController
                     ETimeType.WorkDay,
                     dto.TimeLimit.Value, order.AcceptTypeCode);
                 endTime = expiredTime.EndTime;
-                await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ExpiredTime = expiredTime.EndTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime, NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,Status = EOrderStatus.SendBack })
+                await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ExpiredTime = expiredTime.EndTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime, NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne })
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
                 var orderDto = _mapper.Map<OrderDto>(order);
                 await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,
@@ -4285,10 +4285,10 @@ public class OrderController : BaseController
             var processType = dto.FlowDirection == EFlowDirection.OrgToCenter || dto.FlowDirection == EFlowDirection.CenterToCenter
                 ? EProcessType.Zhiban
                 : EProcessType.Jiaoban;
-            await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ProcessType = processType })
+            await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ProcessType = processType, Status = EOrderStatus.SendBack })
                 .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
             await _workflowApplication.RecallAsync(recall, endTime, order.Status >= EOrderStatus.Filed, HttpContext.RequestAborted);
-            var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == dto.OrderId);
+			var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == dto.OrderId);
             if (publish != null)
             {
                 var publishHistory = _mapper.Map<OrderPublishHistory>(publish);

src/Hotline.Application/Handlers/FlowEngine/WorkflowPreviousHandler.cs

@@ -74,7 +74,7 @@ namespace Hotline.Application.Handlers.FlowEngine
                     var order = await _orderDomainService.GetOrderAsync(workflow.ExternalId, withHotspot: true, withAcceptor: true,
                         withExtension: true, cancellationToken: cancellationToken);
                     order.CheckIfFiled();
-                    order.UpdateHandlingStatus(workflow.IsInCountersign);
+                    //order.UpdateHandlingStatus(workflow.IsInCountersign);
 					_mapper.Map(workflow, order);
                     if (notification.TargetStep.StepType is EStepType.Start)
                     {

src/Hotline.Application/Handlers/FlowEngine/WorkflowRecallHandler.cs

@@ -60,7 +60,7 @@ public class WorkflowRecallHandler : INotificationHandler<RecallNotify>
             case WorkflowModuleConsts.OrderHandle:
                 var order = await _orderDomainService.GetOrderAsync(workflow.ExternalId, withHotspot: true, withAcceptor: true,
                     withExtension: true, cancellationToken: cancellationToken);
-                order.UpdateHandlingStatus(workflow.IsInCountersign);
+                //order.UpdateHandlingStatus(workflow.IsInCountersign);
 				_mapper.Map(workflow, order);
                 if (notification.TargetStep.StepType is EStepType.Start)
                 {

src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -153,5 +153,9 @@ public class OrderMapperConfigs : IRegister
             .Map(d => d.TimeLimit, s => s.TimeText)
             .Map(d => d.TimeLimitCount, s => s.Count)
             .Map(d => d.TimeLimitUnit, s => s.TimeType);
+
+        config.ForType<OrderScreen, OrderScreenListDto>()
+            .IgnoreIf((s, d) => s.VisitDetail == null, d => d.VisitDetail)
+            ;
     }
 }

src/Hotline.Share/Enums/Order/EOrderStatus.cs

@@ -58,7 +58,7 @@ public enum EOrderStatus
 	/// 特提审批中
 	/// </summary>
 	[Description("特提审批中")]
-	SpecialAudit = 105,
+	SpecialAudit = 104,
 
 	/// <summary>
 	/// 退回审批中