Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

src/Hotline.Api/Controllers/OrderController.cs

@@ -3797,8 +3797,9 @@ public class OrderController : BaseController
             OrderStatusOptions = EnumExts.GetDescriptions<EOrderStatus>(),
             CurrentStepOptions = definition?.Steps.Select(x => new Kv(x.Code, x.Name)),
             IdentityTypeOptions = EnumExts.GetDescriptions<EIdentityType>(),
-            OrderTags = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.OrderTag)
-        };
+            OrderTags = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.OrderTag),
+            FocusOnEvents = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.FocusOnEvent)
+    };
         return rsp;
     }
 

src/Hotline.Application/Mappers/WebPortalMapperConfigs.cs

@@ -25,7 +25,7 @@ namespace Hotline.Application.Mappers
                .Map(d => d.ConTypeName, x => x.Order.HotspotName)
                .Map(d => d.FlowAddDate, x => x.Order.StartTime)
                .Map(d => d.PubDate, x => x.CreationTime)
-               .Map(d => d.RSFlagName, x => x.Order.Status <= EOrderStatus.Filed ? "办理中" : "办理完成")
+               .Map(d => d.RSFlagName, x => x.Order.Status < EOrderStatus.Filed ? "办理中" : "办理完成")
           ;
 
             //办件摘编详情
@@ -45,7 +45,7 @@ namespace Hotline.Application.Mappers
             .Map(d => d.FlowBMID, x => x.ActualHandleOrgCode)
             .Map(d => d.FlowBMName, x => x.ActualHandleOrgName)
             .Map(d => d.FlowLKName, x => x.FromName)
-            .Map(d => d.FlowRSFlagName, x => x.Status <= EOrderStatus.Filed ? "办理中" : "办理完成")
+            .Map(d => d.FlowRSFlagName, x => x.Status < EOrderStatus.Filed ? "办理中" : "办理完成")
        ;
 
             //注册用户数据

src/Hotline.Application/Orders/OrderApplication.cs

@@ -1131,6 +1131,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
              .WhereIF(dto.FiledType is FiledType.CenterFiled, d => d.ProcessType == EProcessType.Zhiban)
              .WhereIF(dto.FiledType is FiledType.OrgFiled, d => d.ProcessType == EProcessType.Jiaoban)
              .WhereIF(!string.IsNullOrEmpty(dto.OrderTagCode), d => d.OrderTagCode == dto.OrderTagCode)
+             .WhereIF(!string.IsNullOrEmpty(dto.FocusOnEvents),d=>SqlFunc.SplitIn(d.FocusOnEvents, dto.FocusOnEvents))
              .OrderByIF(string.IsNullOrEmpty(dto.SortField), d => d.CreationTime, OrderByType.Desc)//默认排序时间为创建时间
              .OrderByIF(dto is { SortField: "no", SortRule: 0 }, d => d.No, OrderByType.Asc) //工单编号升序
              .OrderByIF(dto is { SortField: "no", SortRule: 1 }, d => d.No, OrderByType.Desc) //工单编号降序

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

@@ -362,6 +362,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? CurrentHandleOrgAreaName { get; set; }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public string? FocusOnEventsName { get; set; }
+
         #endregion
 
         #region 一级部门
@@ -1253,6 +1258,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? FocusOnEvents { get; set; }
 
+        /// <summary>
+        /// 重点关注事件，保存前端选择文字，用于返回前端数据
+        /// </summary>
+        public string? FocusOnEventsName { get; set; }
+
         /// <summary>
         /// 是否紧急
         /// </summary>

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

@@ -205,6 +205,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public int? SortRule { get; set; }
 
+        /// <summary>
+        /// 重点标记
+        /// </summary>
+        public string? FocusOnEvents { get; set; }
+
     }
 
 

src/Hotline/Orders/Order.cs

@@ -1005,6 +1005,12 @@ namespace Hotline.Orders
         [SugarColumn(ColumnDescription = "重点关注事件")]
         public string? FocusOnEvents { get; set; }
 
+        /// <summary>
+        /// 重点关注事件名称，保存前端选择，用于返回前端数据
+        /// </summary>
+        [SugarColumn(ColumnDescription ="重点关注事件名称")]
+        public string? FocusOnEventsName { get; set; }
+
         /// <summary>
         /// 待发布人Id
         /// </summary>