160 市州通用-特提理由在流程明细上的展示 发布重办需要处理

src/Hotline.Api/Controllers/OrderController.cs

@@ -5890,7 +5890,7 @@ public class OrderController : BaseController
                 NextStepCode = dto.NextStepCode,
                 NextStepName = dto.NextStepName,
                 NextHandlers = dto.NextHandlers,
-                Opinion = dto.Cause,
+                Opinion = "【特提理由】" + dto.Cause,
                 FlowDirection = dto.FlowDirection,
                 HandlerType = dto.HandlerType,
                 BusinessType = dto.BusinessType
@@ -6122,7 +6122,7 @@ public class OrderController : BaseController
                 NextStepCode = dto.NextStepCode,
                 NextStepName = dto.NextStepName,
                 NextHandlers = dto.NextHandlers,
-                Opinion = dto.Reason,
+                Opinion = "【特提理由】" + dto.Reason,
                 FlowDirection = dto.FlowDirection,
                 HandlerType = dto.HandlerType,
                 BusinessType = dto.BusinessType,
@@ -6493,7 +6493,7 @@ public class OrderController : BaseController
                     NextStepCode = special.NextStepCode,
                     NextStepName = special.NextStepName,
                     NextHandlers = special.NextHandlers,
-                    Opinion = dto.Opinion,
+                    Opinion = "【特提理由】" + dto.Opinion,
                     FlowDirection = special.FlowDirection,
                     HandlerType = special.HandlerType.Value,
                     BusinessType = special.BusinessType.Value

src/Hotline.Repository.SqlSugar/Orders/OrderRepository.cs

@@ -1871,8 +1871,8 @@ namespace Hotline.Repository.SqlSugar.Orders
                     ActualHandleOrgName = x.OrderVisit.Order.ActualHandleOrgName,
                     IsProvinceOrder = x.OrderVisit.Order.Source == ESource.ProvinceStraight ? true : false
                 }).MergeTable().OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.VisitTime, OrderByType.Desc)
-				.OrderByIF(dto is { SortField: "orderScreenStatus", SortRule: 0 }, x => x.OrderScreenStatus, OrderByType.Asc) //受理时间升序
-				.OrderByIF(dto is { SortField: "orderScreenStatus", SortRule: 1 }, x => x.OrderScreenStatus, OrderByType.Desc) //受理时间降序
+				.OrderByIF(dto is { SortField: "orderScreenStatusText", SortRule: 0 }, x => x.OrderScreenStatus, OrderByType.Asc) //受理时间升序
+				.OrderByIF(dto is { SortField: "orderScreenStatusText", SortRule: 1 }, x => x.OrderScreenStatus, OrderByType.Desc) //受理时间降序
 				.OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, x => x.CreationTime, OrderByType.Asc) //受理时间升序
                 .OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, x => x.CreationTime, OrderByType.Desc) //受理时间降序
                 .OrderByIF(dto is { SortField: "visitTime", SortRule: 0 }, x => x.VisitTime, OrderByType.Asc) //回访时间升序