修改部门办件统计导出

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

@@ -1564,18 +1564,18 @@ namespace Hotline.Api.Controllers.Bi
                 OrgName = "合计",
                 OrgType = EOrgType.City,
                 // OrderCountNum = items.Sum(p => p.OrderCountNum),
-                YBOrderCountNum = items.Sum(p => p.YBOrderCountNum),
-                ZBOrderCountNum = items.Sum(p => p.ZBOrderCountNum),
+                YbOrderCountNum = items.Sum(p => p.YbOrderCountNum),
+                ZbOrderCountNum = items.Sum(p => p.ZbOrderCountNum),
                 Archived = items.Sum(p => p.Archived),
                 ToBeArchived = items.Sum(p => p.ToBeArchived),
                 WaitPublished = items.Sum(p => p.WaitPublished),
                 PublishedOpen = items.Sum(p => p.PublishedOpen),
                 PublishedNoOpen = items.Sum(p => p.PublishedNoOpen),
-                YBOverdue = items.Sum(p => p.YBOverdue),
-                ZBOverdue = items.Sum(p => p.ZBOverdue),
+                YbOverdue = items.Sum(p => p.YbOverdue),
+                ZbOverdue = items.Sum(p => p.ZbOverdue),
                 CompleteOnTime = items.Sum(p => p.CompleteOnTime),
-                HQYBOverdue = items.Sum(p => p.HQYBOverdue),
-                HQZBOverdue = items.Sum(p => p.HQZBOverdue),
+                HqybOverdue = items.Sum(p => p.HqybOverdue),
+                HqzbOverdue = items.Sum(p => p.HqzbOverdue),
                 DelayEnd = items.Sum(p => p.DelayEnd),
                 DelayWait = items.Sum(p => p.DelayWait),
                 OrderDelayCount = items.Sum(p => p.OrderDelayCount),
@@ -1616,18 +1616,18 @@ namespace Hotline.Api.Controllers.Bi
                 OrgName = "合计",
                 OrgType = EOrgType.City,
                 // OrderCountNum = items.Sum(p => p.OrderCountNum),
-                YBOrderCountNum = list.Sum(p => p.YBOrderCountNum),
-                ZBOrderCountNum = list.Sum(p => p.ZBOrderCountNum),
+                YbOrderCountNum = list.Sum(p => p.YbOrderCountNum),
+                ZbOrderCountNum = list.Sum(p => p.ZbOrderCountNum),
                 Archived = list.Sum(p => p.Archived),
                 ToBeArchived = list.Sum(p => p.ToBeArchived),
                 WaitPublished = list.Sum(p => p.WaitPublished),
                 PublishedOpen = list.Sum(p => p.PublishedOpen),
                 PublishedNoOpen = list.Sum(p => p.PublishedNoOpen),
-                YBOverdue = list.Sum(p => p.YBOverdue),
-                ZBOverdue = list.Sum(p => p.ZBOverdue),
+                YbOverdue = list.Sum(p => p.YbOverdue),
+                ZbOverdue = list.Sum(p => p.ZbOverdue),
                 CompleteOnTime = list.Sum(p => p.CompleteOnTime),
-                HQYBOverdue = list.Sum(p => p.HQYBOverdue),
-                HQZBOverdue = list.Sum(p => p.HQZBOverdue),
+                HqybOverdue = list.Sum(p => p.HqybOverdue),
+                HqzbOverdue = list.Sum(p => p.HqzbOverdue),
                 DelayEnd = list.Sum(p => p.DelayEnd),
                 DelayWait = list.Sum(p => p.DelayWait),
                 OrderDelayCount = list.Sum(p => p.OrderDelayCount),
@@ -1671,18 +1671,18 @@ namespace Hotline.Api.Controllers.Bi
                 OrgName = "合计",
                 OrgType = EOrgType.City,
                 // OrderCountNum = items.Sum(p => p.OrderCountNum),
-                YBOrderCountNum = items.Sum(p => p.YBOrderCountNum),
-                ZBOrderCountNum = items.Sum(p => p.ZBOrderCountNum),
+                YbOrderCountNum = items.Sum(p => p.YbOrderCountNum),
+                ZbOrderCountNum = items.Sum(p => p.ZbOrderCountNum),
                 Archived = items.Sum(p => p.Archived),
                 ToBeArchived = items.Sum(p => p.ToBeArchived),
                 WaitPublished = items.Sum(p => p.WaitPublished),
                 PublishedOpen = items.Sum(p => p.PublishedOpen),
                 PublishedNoOpen = items.Sum(p => p.PublishedNoOpen),
-                YBOverdue = items.Sum(p => p.YBOverdue),
-                ZBOverdue = items.Sum(p => p.ZBOverdue),
+                YbOverdue = items.Sum(p => p.YbOverdue),
+                ZbOverdue = items.Sum(p => p.ZbOverdue),
                 CompleteOnTime = items.Sum(p => p.CompleteOnTime),
-                HQYBOverdue = items.Sum(p => p.HQYBOverdue),
-                HQZBOverdue = items.Sum(p => p.HQZBOverdue),
+                HqybOverdue = items.Sum(p => p.HqybOverdue),
+                HqzbOverdue = items.Sum(p => p.HqzbOverdue),
                 DelayEnd = items.Sum(p => p.DelayEnd),
                 DelayWait = items.Sum(p => p.DelayWait),
                 OrderDelayCount = items.Sum(p => p.OrderDelayCount),
@@ -1723,18 +1723,18 @@ namespace Hotline.Api.Controllers.Bi
                 OrgName = "合计",
                 OrgType = EOrgType.City,
                 // OrderCountNum = items.Sum(p => p.OrderCountNum),
-                YBOrderCountNum = list.Sum(p => p.YBOrderCountNum),
-                ZBOrderCountNum = list.Sum(p => p.ZBOrderCountNum),
+                YbOrderCountNum = list.Sum(p => p.YbOrderCountNum),
+                ZbOrderCountNum = list.Sum(p => p.ZbOrderCountNum),
                 Archived = list.Sum(p => p.Archived),
                 ToBeArchived = list.Sum(p => p.ToBeArchived),
                 WaitPublished = list.Sum(p => p.WaitPublished),
                 PublishedOpen = list.Sum(p => p.PublishedOpen),
                 PublishedNoOpen = list.Sum(p => p.PublishedNoOpen),
-                YBOverdue = list.Sum(p => p.YBOverdue),
-                ZBOverdue = list.Sum(p => p.ZBOverdue),
+                YbOverdue = list.Sum(p => p.YbOverdue),
+                ZbOverdue = list.Sum(p => p.ZbOverdue),
                 CompleteOnTime = list.Sum(p => p.CompleteOnTime),
-                HQYBOverdue = list.Sum(p => p.HQYBOverdue),
-                HQZBOverdue = list.Sum(p => p.HQZBOverdue),
+                HqybOverdue = list.Sum(p => p.HqybOverdue),
+                HqzbOverdue = list.Sum(p => p.HqzbOverdue),
                 DelayEnd = list.Sum(p => p.DelayEnd),
                 DelayWait = list.Sum(p => p.DelayWait),
                 OrderDelayCount = list.Sum(p => p.OrderDelayCount),
@@ -1796,11 +1796,11 @@ namespace Hotline.Api.Controllers.Bi
             var query = _orderReportApplication.GetDepartmentalProcessingStatisticsList(dto.QueryDto, HttpContext.RequestAborted)
                  .LeftJoin<Order>((x, o) => x.Id == o.Id)
                  .Select((x, o) => new { o });
-            List<Orders.Order> list = new List<Order>();
+            List<OrderDto> list = new List<OrderDto>();
             if (dto.IsExportAll)
             {
                 var listData = await query.ToListAsync(HttpContext.RequestAborted);
-                listData.Select(d =>
+                list= listData.Select(d =>
                 {
                     var dto = _mapper.Map<OrderDto>(d.o);
                     return dto;
@@ -1810,18 +1810,18 @@ namespace Hotline.Api.Controllers.Bi
             {
                 RefAsync<int> total = 0;
                 var listData = await query.ToPageListAsync(dto.QueryDto.PageIndex, dto.QueryDto.PageSize, total, HttpContext.RequestAborted);
-                listData.Select(d =>
+                list= listData.Select(d =>
                 {
                     var dto = _mapper.Map<OrderDto>(d.o);
                     return dto;
                 }).ToList();
             }
 
-            var orderDtos = _mapper.Map<ICollection<OrderDto>>(list);
+         //   var orderDtos = _mapper.Map<ICollection<OrderDto>>(list);
 
             dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
 
-            var dtos = orderDtos
+            var dtos = list
                 .Select(stu => _mapper.Map(stu, typeof(DepartmentalProcessingStatisticsDataDto), dynamicClass))
                 .Cast<object>()
                 .ToList();

src/Hotline.Application/StatisticalReport/OrderReportApplication.cs

@@ -132,18 +132,18 @@ namespace Hotline.Application.StatisticalReport
                          {
                              OrgCode = it.OrgCode,
                              // OrderCountNum = SqlFunc.AggregateCount(it.OrgCode),//总量
-                             YBOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed, 1, 0)),//已办// SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed, 1, 0)),//已办
-                             ZBOrderCountNum = 0, //ZBOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status < EOrderStatus.Filed, 1, 0)),//在办
+                             YbOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed, 1, 0)),//已办// SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed, 1, 0)),//已办
+                             ZbOrderCountNum = 0, //ZbOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status < EOrderStatus.Filed, 1, 0)),//在办
                              Archived = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed, 1, 0)),//已归档
                              ToBeArchived = 0,
                              WaitPublished = 0,
                              PublishedOpen = 0,
                              PublishedNoOpen = 0,
-                             YBOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.ActualHandleTime > it.ExpiredTime, 1, 0)),//已办超期
-                             ZBOverdue = 0,// SqlFunc.AggregateSum(SqlFunc.IIF(it.Status < EOrderStatus.Filed && it.ExpiredTime < SqlFunc.GetDate(), 1, 0)),//待办超期
+                             YbOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.ActualHandleTime > it.ExpiredTime, 1, 0)),//已办超期
+                             ZbOverdue = 0,// SqlFunc.AggregateSum(SqlFunc.IIF(it.Status < EOrderStatus.Filed && it.ExpiredTime < SqlFunc.GetDate(), 1, 0)),//待办超期
                              CompleteOnTime = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.ActualHandleTime <= it.ExpiredTime, 1, 0)),//按时办结
-                             HQYBOverdue = 0,
-                             HQZBOverdue = 0,
+                             HqybOverdue = 0,
+                             HqzbOverdue = 0,
                              DelayEnd = 0,
                              DelayWait = 0,
                              OrderDelayCount = 0,
@@ -177,18 +177,18 @@ namespace Hotline.Application.StatisticalReport
                 {
                     OrgCode = it.OrgCode,
                     //  OrderCountNum = 0,//总量
-                    YBOrderCountNum = 0,//已办
-                    ZBOrderCountNum = 0,//在办
+                    YbOrderCountNum = 0,//已办
+                    ZbOrderCountNum = 0,//在办
                     Archived = 0,
                     ToBeArchived = 0,
                     WaitPublished = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status == EOrderStatus.Filed, 1, 0)),//待发布  --已归档的就是待发布
                     PublishedOpen = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Published && it.PublishState, 1, 0)),//已发布公开
                     PublishedNoOpen = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Published && !it.PublishState, 1, 0)),//已发布不公开
-                    YBOverdue = 0,
-                    ZBOverdue = 0,
+                    YbOverdue = 0,
+                    ZbOverdue = 0,
                     CompleteOnTime = 0,
-                    HQYBOverdue = 0,
-                    HQZBOverdue = 0,
+                    HqybOverdue = 0,
+                    HqzbOverdue = 0,
                     DelayEnd = 0,
                     DelayWait = 0,
                     OrderDelayCount = 0,
@@ -226,18 +226,18 @@ namespace Hotline.Application.StatisticalReport
              {
                  OrgCode = d.OrgCode,
                  //OrderCountNum = 0,//总量
-                 YBOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled, 1, 0)),// 0,//已办
-                 ZBOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(d.Status < EWorkflowStepStatus.Handled, 1, 0)),// 0,//在办
+                 YbOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled, 1, 0)),// 0,//已办
+                 ZbOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(d.Status < EWorkflowStepStatus.Handled, 1, 0)),// 0,//在办
                  Archived = 0,
                  ToBeArchived = 0,
                  WaitPublished = 0,
                  PublishedOpen = 0,
                  PublishedNoOpen = 0,
-                 YBOverdue = 0,
-                 ZBOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition == ECountersignPosition.None && d.Status < EWorkflowStepStatus.Handled && DateTime.Now >= d.StepExpiredTime, 1, 0)),// 0,
+                 YbOverdue = 0,
+                 ZbOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition == ECountersignPosition.None && d.Status < EWorkflowStepStatus.Handled && DateTime.Now >= d.StepExpiredTime, 1, 0)),// 0,
                  CompleteOnTime = 0,
-                 HQYBOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled && d.HandleTime > d.StepExpiredTime, 1, 0)),
-                 HQZBOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status < EWorkflowStepStatus.Handled && DateTime.Now >= d.StepExpiredTime, 1, 0)),
+                 HqybOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled && d.HandleTime > d.StepExpiredTime, 1, 0)),
+                 HqzbOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status < EWorkflowStepStatus.Handled && DateTime.Now >= d.StepExpiredTime, 1, 0)),
                  DelayEnd = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled, 1, 0)),
                  DelayWait = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status < EWorkflowStepStatus.Handled, 1, 0)),
                  OrderDelayCount = 0,
@@ -269,18 +269,18 @@ namespace Hotline.Application.StatisticalReport
                 {
                     OrgCode = x.OrgCode,
                     //  OrderCountNum = 0,//总量
-                    YBOrderCountNum = 0,//已办
-                    ZBOrderCountNum = 0,//在办
+                    YbOrderCountNum = 0,//已办
+                    ZbOrderCountNum = 0,//在办
                     Archived = 0,
                     ToBeArchived = 0,
                     WaitPublished = 0,
                     PublishedOpen = 0,
                     PublishedNoOpen = 0,
-                    YBOverdue = 0,
-                    ZBOverdue = 0,
+                    YbOverdue = 0,
+                    ZbOverdue = 0,
                     CompleteOnTime = 0,
-                    HQYBOverdue = 0,
-                    HQZBOverdue = 0,
+                    HqybOverdue = 0,
+                    HqzbOverdue = 0,
                     DelayEnd = 0,
                     DelayWait = 0,
                     OrderDelayCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.DelayState == EDelayState.Pass, 1, 0)),
@@ -314,18 +314,18 @@ namespace Hotline.Application.StatisticalReport
                 {
                     OrgCode = x.OrgCode,
                     // OrderCountNum = 0,//总量
-                    YBOrderCountNum = 0,//已办
-                    ZBOrderCountNum = 0,//在办
+                    YbOrderCountNum = 0,//已办
+                    ZbOrderCountNum = 0,//在办
                     Archived = 0,
                     ToBeArchived = 0,
                     WaitPublished = 0,
                     PublishedOpen = 0,
                     PublishedNoOpen = 0,
-                    YBOverdue = 0,
-                    ZBOverdue = 0,
+                    YbOverdue = 0,
+                    ZbOverdue = 0,
                     CompleteOnTime = 0,
-                    HQYBOverdue = 0,
-                    HQZBOverdue = 0,
+                    HqybOverdue = 0,
+                    HqzbOverdue = 0,
                     DelayEnd = 0,
                     DelayWait = 0,
                     OrderDelayCount = 0,
@@ -358,18 +358,18 @@ namespace Hotline.Application.StatisticalReport
             {
                 OrgCode = x.OrgCode,
                 //  OrderCountNum = 0,//总量
-                YBOrderCountNum = 0,//已办
-                ZBOrderCountNum = 0,//在办
+                YbOrderCountNum = 0,//已办
+                ZbOrderCountNum = 0,//在办
                 Archived = 0,
                 ToBeArchived = 0,
                 WaitPublished = 0,
                 PublishedOpen = 0,
                 PublishedNoOpen = 0,
-                YBOverdue = 0,
-                ZBOverdue = 0,
+                YbOverdue = 0,
+                ZbOverdue = 0,
                 CompleteOnTime = 0,
-                HQYBOverdue = 0,
-                HQZBOverdue = 0,
+                HqybOverdue = 0,
+                HqzbOverdue = 0,
                 DelayEnd = 0,
                 DelayWait = 0,
                 OrderDelayCount = 0,
@@ -392,18 +392,18 @@ namespace Hotline.Application.StatisticalReport
                       OrgName = o.Name,
                       OrgType = o.OrgType,
                       //OrderCountNum = p.OrderCountNum,
-                      YBOrderCountNum = p.YBOrderCountNum,
-                      ZBOrderCountNum = p.ZBOrderCountNum,
+                      YbOrderCountNum = p.YbOrderCountNum,
+                      ZbOrderCountNum = p.ZbOrderCountNum,
                       Archived = p.Archived,
                       ToBeArchived = p.ToBeArchived,
                       WaitPublished = p.WaitPublished,
                       PublishedOpen = p.PublishedOpen,
                       PublishedNoOpen = p.PublishedNoOpen,
-                      YBOverdue = p.YBOverdue,
-                      ZBOverdue = p.ZBOverdue,
+                      YbOverdue = p.YbOverdue,
+                      ZbOverdue = p.ZbOverdue,
                       CompleteOnTime = p.CompleteOnTime,
-                      HQYBOverdue = p.HQYBOverdue,
-                      HQZBOverdue = p.HQZBOverdue,
+                      HqybOverdue = p.HqybOverdue,
+                      HqzbOverdue = p.HqzbOverdue,
                       DelayEnd = p.DelayEnd,
                       DelayWait = p.DelayWait,
                       OrderDelayCount = p.OrderDelayCount,
@@ -453,18 +453,18 @@ namespace Hotline.Application.StatisticalReport
                       {
                           OrgCode = it.OrgCode,
                           //  OrderCountNum = SqlFunc.AggregateCount(it.OrgCode),//总量
-                          YBOrderCountNum = 0,//SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed, 1, 0)),//已办
-                          ZBOrderCountNum = 0,//  ZBOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status < EOrderStatus.Filed, 1, 0)),//在办
+                          YbOrderCountNum = 0,//SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed, 1, 0)),//已办
+                          ZbOrderCountNum = 0,//  ZbOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status < EOrderStatus.Filed, 1, 0)),//在办
                           Archived = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed, 1, 0)),//已归档
                           ToBeArchived = 0,
                           WaitPublished = 0,
                           PublishedOpen = 0,
                           PublishedNoOpen = 0,
-                          YBOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.ActualHandleTime > it.ExpiredTime, 1, 0)),//已办超期
-                          ZBOverdue = 0,// SqlFunc.AggregateSum(SqlFunc.IIF(it.Status < EOrderStatus.Filed && it.ExpiredTime < SqlFunc.GetDate(), 1, 0)),//待办超期
+                          YbOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.ActualHandleTime > it.ExpiredTime, 1, 0)),//已办超期
+                          ZbOverdue = 0,// SqlFunc.AggregateSum(SqlFunc.IIF(it.Status < EOrderStatus.Filed && it.ExpiredTime < SqlFunc.GetDate(), 1, 0)),//待办超期
                           CompleteOnTime = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Filed && it.ActualHandleTime <= it.ExpiredTime, 1, 0)),//按时办结
-                          HQYBOverdue = 0,
-                          HQZBOverdue = 0,
+                          HqybOverdue = 0,
+                          HqzbOverdue = 0,
                           DelayEnd = 0,
                           DelayWait = 0,
                           OrderDelayCount = 0,
@@ -499,18 +499,18 @@ namespace Hotline.Application.StatisticalReport
                 {
                     OrgCode = it.OrgCode,
                     // OrderCountNum = 0,//总量
-                    YBOrderCountNum = 0,//已办
-                    ZBOrderCountNum = 0,//在办
+                    YbOrderCountNum = 0,//已办
+                    ZbOrderCountNum = 0,//在办
                     Archived = 0,
                     ToBeArchived = 0,
                     WaitPublished = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status == EOrderStatus.Filed, 1, 0)),//待发布  --已归档的就是待发布
                     PublishedOpen = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Published && it.PublishState, 1, 0)),//已发布公开
                     PublishedNoOpen = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status >= EOrderStatus.Published && !it.PublishState, 1, 0)),//已发布不公开
-                    YBOverdue = 0,
-                    ZBOverdue = 0,
+                    YbOverdue = 0,
+                    ZbOverdue = 0,
                     CompleteOnTime = 0,
-                    HQYBOverdue = 0,
-                    HQZBOverdue = 0,
+                    HqybOverdue = 0,
+                    HqzbOverdue = 0,
                     DelayEnd = 0,
                     DelayWait = 0,
                     OrderDelayCount = 0,
@@ -549,18 +549,18 @@ namespace Hotline.Application.StatisticalReport
              {
                  OrgCode = d.OrgCode,
                  // OrderCountNum = 0,//总量
-                 YBOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled, 1, 0)),//已办
-                 ZBOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(d.Status < EWorkflowStepStatus.Handled, 1, 0)),// 0,//在办
+                 YbOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled, 1, 0)),//已办
+                 ZbOrderCountNum = SqlFunc.AggregateSum(SqlFunc.IIF(d.Status < EWorkflowStepStatus.Handled, 1, 0)),// 0,//在办
                  Archived = 0,
                  ToBeArchived = 0,
                  WaitPublished = 0,
                  PublishedOpen = 0,
                  PublishedNoOpen = 0,
-                 YBOverdue = 0,
-                 ZBOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.Status < EWorkflowStepStatus.Handled && DateTime.Now >= d.StepExpiredTime, 1, 0)),// 0, 
+                 YbOverdue = 0,
+                 ZbOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.Status < EWorkflowStepStatus.Handled && DateTime.Now >= d.StepExpiredTime, 1, 0)),// 0, 
                  CompleteOnTime = 0,
-                 HQYBOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled && d.HandleTime > d.StepExpiredTime, 1, 0)),
-                 HQZBOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status < EWorkflowStepStatus.Handled && DateTime.Now >= d.StepExpiredTime, 1, 0)),
+                 HqybOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled && d.HandleTime > d.StepExpiredTime, 1, 0)),
+                 HqzbOverdue = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status < EWorkflowStepStatus.Handled && DateTime.Now >= d.StepExpiredTime, 1, 0)),
                  DelayEnd = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status >= EWorkflowStepStatus.Handled, 1, 0)),
                  DelayWait = SqlFunc.AggregateSum(SqlFunc.IIF(d.CountersignPosition > ECountersignPosition.None && d.Status < EWorkflowStepStatus.Handled, 1, 0)),
                  OrderDelayCount = 0,
@@ -593,18 +593,18 @@ namespace Hotline.Application.StatisticalReport
                 {
                     OrgCode = x.OrgCode,
                     //  OrderCountNum = 0,//总量
-                    YBOrderCountNum = 0,//已办
-                    ZBOrderCountNum = 0,//在办
+                    YbOrderCountNum = 0,//已办
+                    ZbOrderCountNum = 0,//在办
                     Archived = 0,
                     ToBeArchived = 0,
                     WaitPublished = 0,
                     PublishedOpen = 0,
                     PublishedNoOpen = 0,
-                    YBOverdue = 0,
-                    ZBOverdue = 0,
+                    YbOverdue = 0,
+                    ZbOverdue = 0,
                     CompleteOnTime = 0,
-                    HQYBOverdue = 0,
-                    HQZBOverdue = 0,
+                    HqybOverdue = 0,
+                    HqzbOverdue = 0,
                     DelayEnd = 0,
                     DelayWait = 0,
                     OrderDelayCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.DelayState == EDelayState.Pass, 1, 0)),
@@ -639,18 +639,18 @@ namespace Hotline.Application.StatisticalReport
                 {
                     OrgCode = x.OrgCode,
                     //  OrderCountNum = 0,//总量
-                    YBOrderCountNum = 0,//已办
-                    ZBOrderCountNum = 0,//在办
+                    YbOrderCountNum = 0,//已办
+                    ZbOrderCountNum = 0,//在办
                     Archived = 0,
                     ToBeArchived = 0,
                     WaitPublished = 0,
                     PublishedOpen = 0,
                     PublishedNoOpen = 0,
-                    YBOverdue = 0,
-                    ZBOverdue = 0,
+                    YbOverdue = 0,
+                    ZbOverdue = 0,
                     CompleteOnTime = 0,
-                    HQYBOverdue = 0,
-                    HQZBOverdue = 0,
+                    HqybOverdue = 0,
+                    HqzbOverdue = 0,
                     DelayEnd = 0,
                     DelayWait = 0,
                     OrderDelayCount = 0,
@@ -684,18 +684,18 @@ namespace Hotline.Application.StatisticalReport
             {
                 OrgCode = x.OrgCode,
                 // OrderCountNum = 0,//总量
-                YBOrderCountNum = 0,//已办
-                ZBOrderCountNum = 0,//在办
+                YbOrderCountNum = 0,//已办
+                ZbOrderCountNum = 0,//在办
                 Archived = 0,
                 ToBeArchived = 0,
                 WaitPublished = 0,
                 PublishedOpen = 0,
                 PublishedNoOpen = 0,
-                YBOverdue = 0,
-                ZBOverdue = 0,
+                YbOverdue = 0,
+                ZbOverdue = 0,
                 CompleteOnTime = 0,
-                HQYBOverdue = 0,
-                HQZBOverdue = 0,
+                HqybOverdue = 0,
+                HqzbOverdue = 0,
                 DelayEnd = 0,
                 DelayWait = 0,
                 OrderDelayCount = 0,
@@ -718,18 +718,18 @@ namespace Hotline.Application.StatisticalReport
                     OrgName = o.Name,
                     OrgType = o.OrgType,
                     //OrderCountNum = p.OrderCountNum,
-                    YBOrderCountNum = p.YBOrderCountNum,
-                    ZBOrderCountNum = p.ZBOrderCountNum,
+                    YbOrderCountNum = p.YbOrderCountNum,
+                    ZbOrderCountNum = p.ZbOrderCountNum,
                     Archived = p.Archived,
                     ToBeArchived = p.ToBeArchived,
                     WaitPublished = p.WaitPublished,
                     PublishedOpen = p.PublishedOpen,
                     PublishedNoOpen = p.PublishedNoOpen,
-                    YBOverdue = p.YBOverdue,
-                    ZBOverdue = p.ZBOverdue,
+                    YbOverdue = p.YbOverdue,
+                    ZbOverdue = p.ZbOverdue,
                     CompleteOnTime = p.CompleteOnTime,
-                    HQYBOverdue = p.HQYBOverdue,
-                    HQZBOverdue = p.HQZBOverdue,
+                    HqybOverdue = p.HqybOverdue,
+                    HqzbOverdue = p.HqzbOverdue,
                     DelayEnd = p.DelayEnd,
                     DelayWait = p.DelayWait,
                     OrderDelayCount = p.OrderDelayCount,

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

@@ -126,18 +126,18 @@ namespace Hotline.Repository.SqlSugar.Orders
                        {
                            OrgCode = p.OrgCode,
                          //  OrderCountNum = SqlFunc.AggregateSum(p.OrderCountNum),
-                           YBOrderCountNum = SqlFunc.AggregateSum(p.YBOrderCountNum),
-                           ZBOrderCountNum = SqlFunc.AggregateSum(p.ZBOrderCountNum),
+                           YbOrderCountNum = SqlFunc.AggregateSum(p.YbOrderCountNum),
+                           ZbOrderCountNum = SqlFunc.AggregateSum(p.ZbOrderCountNum),
                            Archived = SqlFunc.AggregateSum(p.Archived),
                            ToBeArchived = SqlFunc.AggregateSum(p.ToBeArchived),
                            WaitPublished = SqlFunc.AggregateSum(p.WaitPublished),
                            PublishedOpen = SqlFunc.AggregateSum(p.PublishedOpen),
                            PublishedNoOpen = SqlFunc.AggregateSum(p.PublishedNoOpen),
-                           YBOverdue = SqlFunc.AggregateSum(p.YBOverdue),
-                           ZBOverdue = SqlFunc.AggregateSum(p.ZBOverdue),
+                           YbOverdue = SqlFunc.AggregateSum(p.YbOverdue),
+                           ZbOverdue = SqlFunc.AggregateSum(p.ZbOverdue),
                            CompleteOnTime= SqlFunc.AggregateSum(p.CompleteOnTime),
-                           HQYBOverdue = SqlFunc.AggregateSum(p.HQYBOverdue),
-                           HQZBOverdue = SqlFunc.AggregateSum(p.HQZBOverdue),
+                           HqybOverdue = SqlFunc.AggregateSum(p.HqybOverdue),
+                           HqzbOverdue = SqlFunc.AggregateSum(p.HqzbOverdue),
                            DelayEnd = SqlFunc.AggregateSum(p.DelayEnd),
                            DelayWait = SqlFunc.AggregateSum(p.DelayWait),
                            OrderDelayCount = SqlFunc.AggregateSum(p.OrderDelayCount),

src/Hotline.Share/Requests/DepartmentalProcessingStatisticsDto.cs

@@ -46,17 +46,17 @@ namespace Hotline.Share.Requests
         /// <summary>
         /// 信件总量
         /// </summary>
-        public int OrderCountNum => YBOrderCountNum + ZBOrderCountNum;
+        public int OrderCountNum => YbOrderCountNum + ZbOrderCountNum;
 
         /// <summary>
         /// 信件已办总量
         /// </summary>
-        public int YBOrderCountNum { get; set; }
+        public int YbOrderCountNum { get; set; }
 
         /// <summary>
         /// 信件未办总量
         /// </summary>
-        public int ZBOrderCountNum { get; set; }
+        public int ZbOrderCountNum { get; set; }
 
         /// <summary>
         /// 按时办结
@@ -66,12 +66,12 @@ namespace Hotline.Share.Requests
         /// <summary>
         /// 按时办结率
         /// </summary>
-        public double CompleteOnTimeRate => CalcRate(YBOrderCountNum, CompleteOnTime);
+        public string CompleteOnTimeRate => CalcRate(YbOrderCountNum, CompleteOnTime);
 
         /// <summary>
         /// 办结率
         /// </summary>
-        public double OrderCompletionRate => CalcRate(OrderCountNum, YBOrderCountNum);
+        public string OrderCompletionRate => CalcRate(OrderCountNum, YbOrderCountNum);
         #endregion
 
         #region 归档
@@ -107,32 +107,32 @@ namespace Hotline.Share.Requests
         /// <summary>
         /// 已办超期
         /// </summary>
-        public int YBOverdue { get; set; }
+        public int YbOverdue { get; set; }
 
         /// <summary>
         /// 待办超期
         /// </summary>
-        public int ZBOverdue { get; set; }
+        public int ZbOverdue { get; set; }
 
         /// <summary>
         /// 会签已办超期
         /// </summary>
-        public int HQYBOverdue { get; set; }
+        public int HqybOverdue { get; set; }
 
         /// <summary>
         /// 会签待办超期
         /// </summary>
-        public int HQZBOverdue { get; set; }
+        public int HqzbOverdue { get; set; }
 
         /// <summary>
         /// 超期件数
         /// </summary>
-        public int SubtotalOverdue => YBOverdue + ZBOverdue + HQYBOverdue + HQZBOverdue;
+        public int SubtotalOverdue => YbOverdue + ZbOverdue + HqybOverdue + HqzbOverdue;
 
         /// <summary>
         /// 会签超期率
         /// </summary>
-        public double HQOverdueRate => CalcRate(OrderCountNum, SubtotalOverdue);
+        public string HqOverdueRate => CalcRate(OrderCountNum, SubtotalOverdue);
         #endregion
 
         #region 会签信息
@@ -156,7 +156,7 @@ namespace Hotline.Share.Requests
         /// <summary>
         /// 延期率
         /// </summary>
-        public double OrderDelayRate => CalcRate(OrderCountNum, OrderDelayCount);
+        public string OrderDelayRate => CalcRate(OrderCountNum, OrderDelayCount);
         #endregion
 
         #region 甄别
@@ -195,7 +195,7 @@ namespace Hotline.Share.Requests
         /// <summary>
         /// 满意率
         /// </summary>
-        public double SatisfactionRate => CalcRate(SatisfactionCount + NotSatisfactionCount, SatisfactionCount);
+        public string SatisfactionRate => CalcRate(SatisfactionCount + NotSatisfactionCount, SatisfactionCount);
         #endregion
 
 
@@ -203,13 +203,13 @@ namespace Hotline.Share.Requests
         /// 计算率
         /// </summary>
         /// <returns></returns>
-        public double CalcRate(int Count, int Quantity)
+        public string CalcRate(int Count, int Quantity)
         {
             if (Count != 0 && Quantity != 0)
             {
-                return Math.Round((Quantity / (double)Count) * 100, 2);
+                return Math.Round((Quantity / (double)Count) * 100, 2) + "%";
             }
-            return 0;
+            return "0%";
         }
 
     }