Преглед изворни кода

新增形式主义工单、敏感类工单 工单标签

tangjiang пре 10 месеци
родитељ
комит
04f0938163

+ 1 - 0
src/Hotline.Api/Controllers/HomeController.cs

@@ -185,6 +185,7 @@ public class HomeController : BaseController
 			IsAverageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]),
             IsOpenJudicialManagement = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.IsOpenJudicialManagement).SettingValue[0]),
             NoSignOrgCode = _systemSettingCacheManager.GetSetting(SettingConstants.NoSignOrgCode).SettingValue,
+            IsOpenRepeatedWorkOrders= bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.IsOpenRepeatedWorkOrders).SettingValue[0])
         };
         return rsp;
     }

+ 35 - 23
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -369,9 +369,9 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 是否延期 
         /// </summary>
-        public string? DelayText => DelayingCount > 0 ? "是" : "否"; 
+        public string? DelayText => DelayingCount > 0 ? "是" : "否";
 
-		private string CalculateExpiredText()
+        private string CalculateExpiredText()
         {
             //todo 完整处理方案:1.创建待过期表,Id,过期时间,即将过期时间等字段。2.延迟消息通知处理过期,删除子表数据,处理order过期状态字段。3.此处即可采用expiredStatus进行判断
             //todo 目前暂时采用过期时间计算
@@ -458,41 +458,42 @@ namespace Hotline.Share.Dtos.Order
         public bool IsResolved { get; set; }
         public string IsResolvedText => IsResolved ? "已解决" : "未解决";
 
-		#region 副本工单
+        #region 副本工单
 
-		/// <summary>
-		/// 修改人	
-		/// </summary>
-		public string AuditUserName { get; set; }
-		public string AuditUserId { get; set; }
+        /// <summary>
+        /// 修改人	
+        /// </summary>
+        public string AuditUserName { get; set; }
+        public string AuditUserId { get; set; }
 
-		/// <summary>
-		///  修改时间
-		/// </summary>
-		public DateTime AuditTime { get; set; }
+        /// <summary>
+        ///  修改时间
+        /// </summary>
+        public DateTime AuditTime { get; set; }
         #endregion
 
         public string OverDays => GetOverDays();
 
 
-		public string GetOverDays() {
+        public string GetOverDays()
+        {
             var overDays = "0天";
             if (ExpiredTime.HasValue)
             {
                 if (FiledTime.HasValue && ExpiredTime < FiledTime)
                 {
                     overDays = (FiledTime - ExpiredTime).Value.Days + "天";
-				}
-                else if(ExpiredTime < DateTime.Now)
+                }
+                else if (ExpiredTime < DateTime.Now)
                 {
-					overDays =  (DateTime.Now - ExpiredTime).Value.Days + "天";
-				}
+                    overDays = (DateTime.Now - ExpiredTime).Value.Days + "天";
+                }
             }
             return overDays;
         }
-	}
+    }
 
-	public class UpdateOrderDto : AddOrderDto
+    public class UpdateOrderDto : AddOrderDto
     {
         public string Id { get; set; }
     }
@@ -770,6 +771,16 @@ namespace Hotline.Share.Dtos.Order
         /// 是否行政执法类
         /// </summary>
         public bool? IsEnforcementOrder { get; set; }
+
+        /// <summary>
+        /// 形式主义工单
+        /// </summary>
+        public bool IsFormalistWorkOrder { get; set; }
+
+        /// <summary>
+        /// 敏感类工单
+        /// </summary>
+        public bool IsSensitiveWorkOrders { get; set; }
     }
 
     public record CanLinkCallRecordOrderDto : PagedKeywordRequest
@@ -795,11 +806,12 @@ namespace Hotline.Share.Dtos.Order
 
     public record OrderCopyListDto : PagedKeywordRequest
     {
-	    public string OrderId { get; set; }
-	}
+        public string OrderId { get; set; }
+    }
+
+    public class UnsignedOrderDto
+    {
 
-    public class UnsignedOrderDto { 
-    
         public OrderDto Order { get; set; }
 
         public WorkflowStepDto WorkflowStep { get; set; }

+ 12 - 0
src/Hotline/Orders/Order.cs

@@ -742,6 +742,18 @@ namespace Hotline.Orders
         /// </summary>
         public bool? IsEnforcementOrder { get; set; }
 
+        /// <summary>
+        /// 形式主义工单
+        /// </summary>
+        [SugarColumn(DefaultValue = "f")]
+        public bool IsFormalistWorkOrder { get; set; }
+
+        /// <summary>
+        /// 敏感类工单
+        /// </summary>
+        [SugarColumn(DefaultValue = "f")]
+        public bool IsSensitiveWorkOrders { get; set; }
+
         /// <summary>
         /// 部门是否解决
         /// </summary>

+ 9 - 2
src/Hotline/Settings/SettingConstants.cs

@@ -1,4 +1,6 @@
-namespace Hotline.Settings
+using Hotline.Users;
+
+namespace Hotline.Settings
 {
     public class SettingConstants
     {
@@ -347,5 +349,10 @@
         /// 定量查询数据条数上限
         /// </summary>
         public const string ConstantQueryCount = "ConstantQueryCount";
-	}
+
+        /// <summary>
+        /// 是否开启重复工单
+        /// </summary>
+        public const string IsOpenRepeatedWorkOrders = "IsOpenRepeatedWorkOrders";
+    }
 }