Merge branch 'release' into feature/ProvinceStatistics

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 })
+                await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ExpiredTime = expiredTime.EndTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime, NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,Status = EOrderStatus.SendBack })
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
                 var orderDto = _mapper.Map<OrderDto>(order);
                 await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,
@@ -6173,7 +6173,7 @@ public class OrderController : BaseController
         if (string.IsNullOrEmpty(dto.StepId))
         {
             await _orderRepository.Updateable()
-                .SetColumns(o => new Orders.Order() { SignerId = dto.Handler.UserId, SignerName = dto.Handler.Username })
+                .SetColumns(o => new Orders.Order() { SignerId = dto.Handler.UserId, SignerName = dto.Handler.Username,Status = EOrderStatus.HandOver })
                 .Where(o => o.Id == dto.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
         }
         else
@@ -6187,7 +6187,10 @@ public class OrderController : BaseController
             {
                 new(dto.Handler.UserId,dto.Handler.Username,dto.Handler.OrgId,dto.Handler.OrgName,step.RoleId,step.RoleName, new List<WorkflowStep>{step})
             }, HttpContext.RequestAborted);
-        }
+			await _orderRepository.Updateable()
+				.SetColumns(o => new Orders.Order() { Status = EOrderStatus.HandOver })
+				.Where(o => o.Id == dto.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
+		}
     }
 
     #endregion

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.Application/Orders/OrderApplication.cs

@@ -1288,7 +1288,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             _mapper.Map(dto, order);
             if (files != null && files.Any())
                 order.FileJson = await _fileRepository.AddFileAsync(files, order.Id, "", cancellationToken);
-            await _orderRepository.UpdateAsync(order, cancellationToken);
+            order.ReTransactNum++;
+			await _orderRepository.UpdateAsync(order, cancellationToken);
 
             if (orderExtension is not null)
             {

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

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

src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -586,7 +586,7 @@ namespace Hotline.Settings.TimeLimits
                         var duration =  WorkEndTime - WorkBeginTime;
                         double workMinutes = duration.TotalMinutes;
                         double totalWorkMinutes = (workMinutes * timeValue) * (Percentage/100.00);
-                        double totalWorkMinutesOne = (workMinutes * timeValue) * (Percentage / 50.00);
+                        double totalWorkMinutesOne = (workMinutes * timeValue) * (PercentageOne / 100.00);
                         
                         //判断开始时间不在工时间段修正时间复位至当天或者第二天的开始时间（如果大于结束时间则复位至第二天的开始时间）
                         if (beginTime < WorkBeginTime)