Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -78,8 +78,23 @@ namespace Hotline.Api.Controllers.Bi
             _systemSettingCacheManager = systemSettingCacheManager;
         }
 
+        //public async Task OrgDataListDetail([FromQuery] OrgDataListDetailRequest dto)
+        //{
+        //    dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
+            
+        //    await _orderRepository.Queryable()
+        //    .Where(x => x.CreationTime >= dto.StartDate && x.CreationTime <= dto.EndDate)
+        //    .WhereIF(dto.QueryType == 1, x => x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.FiledTime) //业务已办超期
+        //    //.WhereIF(dto.QueryType== 2,) //会签已办超期
+        //    .WhereIF(dto.QueryType == 3, x => x.Status < EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate()) //业务待办超期
+        //    //.WhereIF(dto.QueryType ==4,) //会签待办超期
+        //    .ToPageListAsync(dto.PageIndex, dto.PageSize);
+            
+        //}
+
+
         /// <summary>
-        /// 部门数据统计
+        /// 部门超期统计
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -87,6 +102,9 @@ namespace Hotline.Api.Controllers.Bi
         public async Task<PagedDto<OrderBiOrgDataListVo>> OrgDataList([FromQuery] ReportPagedRequest dto)
         {
             if (!dto.StartTime.HasValue || !dto.EndTime.HasValue) throw UserFriendlyException.SameMessage("请选择时间!");
+
+            dto.EndTime = dto.EndTime.Value.AddDays(1).AddSeconds(-1);
+
             var queryOrder = _orderRepository.Queryable(false, false, false)
                 .LeftJoin<SystemOrganize>((x, o) => x.ActualHandleOrgCode == o.Id)
                 .WhereIF(dto.StartTime.HasValue, (x, o) => x.CreationTime >= dto.StartTime)
@@ -96,8 +114,8 @@ namespace Hotline.Api.Controllers.Bi
                 {
                     OrgName = o.Name,
                     OrgId = x.ActualHandleOrgCode,
-                    HandlerExtendedNum = SqlFunc.AggregateSum(SqlFunc.IIF((int)x.Status >= 300 && x.ExpiredTime < x.FiledTime, 1, 0)),
-                    NoHandlerExtendedNum = SqlFunc.AggregateSum(SqlFunc.IIF((int)x.Status < 300 && x.ExpiredTime < SqlFunc.GetDate(), 1, 0)),
+                    HandlerExtendedNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status >=  EOrderStatus.Filed && x.ExpiredTime < x.FiledTime, 1, 0)),
+                    NoHandlerExtendedNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.Status <  EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate(), 1, 0)),
                 }).MergeTable();
             var queryCountersign = _workflowCountersignRepository.Queryable()
                 .LeftJoin<WorkflowCountersignMember>((x, o) => x.Id == o.WorkflowCountersignId)
@@ -108,7 +126,7 @@ namespace Hotline.Api.Controllers.Bi
                 {
                     OrgId = o.Key,
                     CounterHandlerExtendedNum = SqlFunc.AggregateSum(SqlFunc.IIF(o.IsHandled, 1, 0)),
-                    CounterNoHandlerExtendedNum = SqlFunc.AggregateSum(SqlFunc.IIF(!o.IsHandled, 1, 0)),
+                    CounterNoHandlerExtendedNum = SqlFunc.AggregateSum(SqlFunc.IIF(o.IsHandled==false, 1, 0)),
                 }).MergeTable();
 
             var query = queryOrder.LeftJoin(queryCountersign, (or, co) => or.OrgId == co.OrgId)
@@ -1310,12 +1328,6 @@ namespace Hotline.Api.Controllers.Bi
             var queryPush = query.LeftJoin(queryPublish, (it, o) => it.Id == o.Id).Where(it => it.OrgCode != null);
 
 
-
-
-
-
-
-
             return await queryPush.GroupBy((it, o) => new
             {
                 it.OrgCode

src/Hotline.Application/Handlers/FlowEngine/WorkflowRecallHandler.cs

@@ -58,6 +58,8 @@ public class WorkflowRecallHandler : INotificationHandler<RecallNotify>
                 if (notification.TargetStep.StepType is EStepType.Start)
                 {
                     order.Status = EOrderStatus.SpecialToUnAccept;
+                    order.SignerId = "";
+                    order.SignerName = "";
                     order.BackToUnsign();
                 }
 

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

@@ -12,12 +12,22 @@ namespace Hotline.Share.Dtos.Order
 
 		public string OrgId { get; set; }
 
+		/// <summary>
+		/// 业务已办超期
+		/// </summary>
 		public int HandlerExtendedNum { get; set; }
 
+		/// <summary>
+		/// 会签已办超期
+		/// </summary>
 		public int CounterHandlerExtendedNum { get; set; }
-
+		/// <summary>
+		/// 业务待办超期
+		/// </summary>
 		public int NoHandlerExtendedNum { get; set; }
-
+		/// <summary>
+		/// 会签待办超期
+		/// </summary>
 		public int CounterNoHandlerExtendedNum { get; set; }
 
 		public int Subtotal => HandlerExtendedNum + CounterHandlerExtendedNum + NoHandlerExtendedNum + CounterNoHandlerExtendedNum;

src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -30,6 +30,37 @@ public record ReportPagedRequest : PagedKeywordRequest
 
 }
 
+public record OrgDataListDetailRequest:PagedRequest
+{
+	/// <summary>
+	/// 开始时间
+	/// </summary>
+	public DateTime StartDate { get; set; }
+	/// <summary>
+	/// 结束时间
+	/// </summary>
+	public DateTime EndDate { get; set; }
+	/// <summary>
+	/// 部门Code
+	/// </summary>
+	public string OrgCode {  get; set; }
+
+	/// <summary>
+	/// 工单编号
+	/// </summary>
+	public string? No { get; set; }
+
+	/// <summary>
+	/// 查询状态 1：业务已办超期  2：会签已办超期  3：业务待办超期  4：会签待办超期
+	/// </summary>
+	public int QueryType { get; set; }
+
+	/// <summary>
+	/// 超期类型 1：系统中超期  2：申请延期超期
+	/// </summary>
+	public int ExpiredType { get; set; }
+}
+
 public record PublishedPagedRequest : PagedKeywordRequest {
 	/// <summary>
 	/// 是否解决