Merge branch 'release' into feature/ProvinceStatistics

src/Hotline.Application/Orders/OrderApplication.cs

@@ -231,7 +231,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                //&& stTime >= d.ExpiredTime.Value && stTime2 <= d.ExpiredTime.Value
 			//.Where(d => d.ExpiredTime != null &&
    //         d.Status != EOrderStatus.Filed && d.Status != EOrderStatus.Published && d.Status != EOrderStatus.Visited && stTime >= d.ExpiredTime.Value && stTime2 <= d.ExpiredTime.Value)
-            .Where(d=>d.Status < EOrderStatus.Filed && dateTime > d.NearlyExpiredTime && dateTime < d.ExpiredTime)
+            .Where(d=>d.Status < EOrderStatus.Filed && (dateTime > d.NearlyExpiredTimeOne  || dateTime > d.NearlyExpiredTime) && dateTime < d.ExpiredTime)
             .OrderByDescending(d => d.CreationTime);
     }
 

src/Hotline.Application/Orders/OrderSecondaryHandlingApplication.cs

@@ -231,7 +231,7 @@ namespace Hotline.Application.Orders
                 .WhereIF(!string.IsNullOrEmpty(dto.OrgProcessingResults), x => SqlFunc.JsonField(x.OrgProcessingResults, "Key") == dto.OrgProcessingResults)
                 .WhereIF(!string.IsNullOrEmpty(dto.OrgHandledAttitude), x => SqlFunc.JsonListObjectAny(x.OrgHandledAttitude, "Key", dto.OrgHandledAttitude))
                 .WhereIF(!string.IsNullOrEmpty(dto.OrgNoSatisfiedReason), x => SqlFunc.JsonField(x.OrgNoSatisfiedReason, "Key") == dto.OrgNoSatisfiedReason)
-                .Where((x, s) => x.OrderVisit.VisitState != EVisitState.None && x.OrderVisit.IsCanHandle)
+                .Where((x, s) => x.OrderVisit.VisitState == EVisitState.Visited && x.OrderVisit.IsCanHandle)
                 .Where((x, s) => x.OrderVisit.Order.CounterSignType == null && x.OrderVisit.Order.ActualHandleOrgCode == _sessionContext.OrgId)
                 ;
             if (_sessionContext.OrgId != null && !_sessionContext.OrgIsCenter)
@@ -239,7 +239,7 @@ namespace Hotline.Application.Orders
                 query.WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                         (x, s) => x.OrderVisit.Order.Title.Contains(dto.Keyword!) ||
                                   x.OrderVisit.Order.No.Contains(dto.Keyword!))
-                    .Where((x, s) => x.VisitTarget == EVisitTarget.Org && x.VisitOrgCode.StartsWith(_sessionContext.OrgId) && (
+                    .Where((x, s) => x.VisitTarget == EVisitTarget.Org && x.VisitOrgCode == _sessionContext.OrgId && (
                         SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
                         SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2"
                         || SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == "1" ||

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

@@ -778,7 +778,9 @@ namespace Hotline.Repository.SqlSugar.Orders
                     ActualHandleTime = x.ActualHandleTime,
                     AcceptType = x.AcceptType,
                     HotspotName = x.HotspotName,
-                    AcceptorName = x.AcceptorName
+                    AcceptorName = x.AcceptorName,
+                    NearlyExpiredTime = x.NearlyExpiredTime,
+                    NearlyExpiredTimeOne = x.NearlyExpiredTimeOne
                 }).OrderByDescending(x => x.CreationTime);
             return query;
         }
@@ -815,7 +817,9 @@ namespace Hotline.Repository.SqlSugar.Orders
                    ActualHandleTime = x.ActualHandleTime,
                    AcceptType = x.AcceptType,
                    HotspotName = x.HotspotName,
-                   AcceptorName = x.AcceptorName
+                   AcceptorName = x.AcceptorName,
+                   NearlyExpiredTime = x.NearlyExpiredTime,
+                   NearlyExpiredTimeOne = x.NearlyExpiredTimeOne
                }).OrderByDescending(x => x.CreationTime);
             return query;
         }

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

@@ -460,10 +460,18 @@ namespace Hotline.Share.Dtos.Order
             //ExpiredStatus
             if (ExpiredTime.HasValue)
             {
-                if (dateTime < NearlyExpiredTime)
+                if (NearlyExpiredTimeOne.HasValue && dateTime < NearlyExpiredTimeOne)
                 {
                     return EExpiredStatus.Normal;
                 }
+                else if(!NearlyExpiredTimeOne.HasValue && dateTime< NearlyExpiredTime)
+                {
+                    return EExpiredStatus.Normal;
+                }
+                else if (NearlyExpiredTimeOne.HasValue && dateTime > NearlyExpiredTimeOne && dateTime < NearlyExpiredTime)
+                {
+                    return EExpiredStatus.GoingToExpiredOne;
+                }
                 else if (dateTime > NearlyExpiredTime && dateTime < ExpiredTime)
                 {
                     return EExpiredStatus.GoingToExpired;

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

@@ -13,7 +13,7 @@ public enum EExpiredStatus
     /// <summary>
     /// 即将超期
     /// </summary>
-    [Description("即将超期")]
+    [Description("剩余时间小于20%")]
     GoingToExpired = 1,
 
     /// <summary>
@@ -21,4 +21,10 @@ public enum EExpiredStatus
     /// </summary>
     [Description("已超期")]
     Expired = 2,
+
+    /// <summary>
+    /// 即将超期
+    /// </summary>
+    [Description("剩余时间小于50%")]
+    GoingToExpiredOne = 3,
 }

src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -485,10 +485,18 @@ public class HotspotAndAreaStatisticsDetailDto
         }
         if (ExpiredTime.HasValue)
         {
-            if (dateTime < NearlyExpiredTime)
+            if (NearlyExpiredTimeOne.HasValue && dateTime < NearlyExpiredTimeOne)
             {
                 return EExpiredStatus.Normal;
             }
+            else if (!NearlyExpiredTimeOne.HasValue && dateTime < NearlyExpiredTime)
+            {
+                return EExpiredStatus.Normal;
+            }
+            else if (NearlyExpiredTimeOne.HasValue && dateTime > NearlyExpiredTimeOne && dateTime < NearlyExpiredTime)
+            {
+                return EExpiredStatus.GoingToExpiredOne;
+            }
             else if (dateTime > NearlyExpiredTime && dateTime < ExpiredTime)
             {
                 return EExpiredStatus.GoingToExpired;
@@ -573,6 +581,11 @@ public class HotspotAndAreaStatisticsDetailDto
     /// </summary>
     public DateTime? NearlyExpiredTime { get; set; }
 
+    /// <summary>
+    /// 即将超期时间第一级
+    /// </summary>
+    public DateTime? NearlyExpiredTimeOne { get; set; }
+
     /// <summary>
     /// 接办部门名称
     /// </summary>

src/Hotline/Permissions/EPermission.cs

@@ -430,7 +430,11 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName ="退回列表",Name ="退回列表",Description ="退回列表")]
         OrderPreviousReadList = 200505,
-
+        /// <summary>
+        /// 数据范围
+        /// </summary>
+        [Display(GroupName ="退回列表",Name ="数据范围",Description ="数据范围")]
+        OrderPreviousDataRange = 200506,
         #endregion
 
         #endregion
@@ -2280,6 +2284,21 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName ="数据统计",Name ="区域分时统计",Description ="区域分时统计")]
         AreaTimeStatistics = 110219,
+        /// <summary>
+        /// 受理类型统计
+        /// </summary>
+        [Display(GroupName ="数据统计",Name ="受理类型统计",Description ="受理类型统计")]
+        AcceptTypeStatistics = 110220,
+        /// <summary>
+        /// 下级区域统计
+        /// </summary>
+        [Display(GroupName ="数据统计",Name ="下级区域统计",Description ="下级区域统计")]
+        NextLevelAreaStatistics = 110221,
+        /// <summary>
+        /// 热点区域统计
+        /// </summary>
+        [Display(GroupName ="数据统计",Name ="热点区域统计",Description ="热点区域统计")]
+        HotspotAndAreaStatistics = 110222,
         #endregion
 
         #region 知识库统计（11,03,00）
@@ -2436,6 +2455,19 @@ namespace Hotline.Permissions
         SiFaOrgVisitAndOrgSatisfactionStatistics = 120205,
         #endregion
 
+        #region 自定义工单
+        /// <summary>
+        /// 自定义工单
+        /// </summary>
+        [Display(GroupName ="司法自定义工单",Name ="自定义工单",Description ="自定义工单")]
+        SiFaCustomOrder = 120300,
+        /// <summary>
+        /// 新建工单
+        /// </summary>
+        [Display(GroupName ="司法自定义工单",Name ="新建工单",Description ="新建工单")]
+        SiFaNewOrder = 120301,
+
+        #endregion
 
         #endregion