qinchaoyue 2 月之前
父节点
当前提交
53e5bc4e4a

+ 13 - 12
src/Hotline.Application/Snapshot/BiSnapshotApplication.cs

@@ -2,6 +2,7 @@
 using Hotline.FlowEngine.Workflows;
 using Hotline.Orders;
 using Hotline.Share.Dtos.Snapshot;
+using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Snapshot;
 using Hotline.Snapshot;
 using Hotline.Snapshot.Interfaces;
@@ -64,20 +65,20 @@ public class BiSnapshotApplication : IBiSnapshotApplication, IScopeDependency
                 YFG = SqlFunc.AggregateSum(SqlFunc.IIF(redPackAudit.IsSend == true, 1, 0)), //已发(个)
                 WFLXG = 0, // 无法联系(个)
                 WJHBG = SqlFunc.AggregateSum(SqlFunc.IIF(record.FailCase == ERedPackPickupFailCase.Excuse, 1, 0)),  // 婉拒红包(个)
-                WGYYFJLJE = 0, //网格员应发奖励金额
-                WGYYFFJLZE = 0, // 网格员已发放奖励总额
-                WGYDFFJLZE = 0, // 网格员待发放奖励总额
+                WGYYFJLJE = SqlFunc.AggregateSum(SqlFunc.IIF(guiderAudit.LevelTwoStatus == ERedPackAuditStatus.Agree, guiderAudit.AcutalAmount, 0)), //网格员应发奖励金额
+                WGYYFFJLZE = SqlFunc.AggregateSum(SqlFunc.IIF(guiderAudit.IsSend == true, guiderAudit.AcutalAmount, 0)), // 网格员已发放奖励总额
+                WGYDFFJLZE = SqlFunc.AggregateSum(SqlFunc.IIF(guiderAudit.LevelTwoStatus == ERedPackAuditStatus.Agree && guiderAudit.IsSend == false, guiderAudit.ApprovedAmount, 0)), // 网格员待发放奖励总额
                 WGYKKZEYF = 0, // 网格员扣款总额(已发)
                 WGYKKZEDF = 0, // 网格员扣款总额(待发)
-                SLFWNDBMHQJJS = 0, // 受理范围内多部门会签件件数
-                SLFWNRXZXGDJS = 0, // 受理范围内热线中心归档件数
-                RXZXFQHQJJS = 0, // 热线中心发起会签件件数
-                AQYH = 0, // 安全隐患
-                YWCAQYHZG = 0, // 已完成安全隐患整改
-                SQYQGDJS = 0, // 申请延期工单件数
-                SQYQGDCS = 0, // 申请延期工单次数
-                CQJ = 0, // 超期件
-                ECBLJSTHBM = 0, // 二次办理件数 - 退回部门
+                SLFWNDBMHQJJS = SqlFunc.AggregateSum(SqlFunc.IIF(order.CounterSignType != null, 1, 0)), // 受理范围内多部门会签件件数
+                SLFWNRXZXGDJS = SqlFunc.AggregateSum(SqlFunc.IIF(order.FileOrgIsCenter == true, 1, 0)), // 受理范围内热线中心归档件数
+                RXZXFQHQJJS = SqlFunc.AggregateSum(SqlFunc.IIF(order.CounterSignType != null && order.CounterSignType == ECounterSignType.Center, 1, 0)), // 热线中心发起会签件件数
+                AQYH = SqlFunc.AggregateSum(SqlFunc.IIF(snapshot.IsDangerDepartment== true, 1, 0)), // 安全隐患
+                YWCAQYHZG = SqlFunc.AggregateSum(SqlFunc.IIF(snapshot.IsRectifyDepartment == true, 1, 0)), // 已完成安全隐患整改
+                SQYQGDJS = SqlFunc.AggregateSum(SqlFunc.IIF(order.OrderDelays.Count(m => m.DelayState == Share.Enums.Order.EDelayState.Pass) > 0, 1, 0)), // 申请延期工单件数
+                SQYQGDCS = SqlFunc.AggregateSum(SqlFunc.IIF(order.OrderDelays.Count() > 0, order.OrderDelays.Count(m => m.DelayState == Share.Enums.Order.EDelayState.Pass), 0)), // 申请延期工单次数
+                CQJ = SqlFunc.AggregateSum(SqlFunc.IIF(order.DaysOverdueOrgName != null, 1, 0)), // 超期件
+                ECBLJSTHBM = SqlFunc.AggregateSum(SqlFunc.IIF()), // 二次办理件数 - 退回部门
                 ECBLJSHFBMYCB = 0, // 二次办理件数-回访不满意重办
                 ECBLJSTTDYYJBM = 0, // 二次办理件数-特提到原一级部门
                 ECBLGDMYL = 0, // 二次办理工单满意率

+ 3 - 3
src/Hotline.Share/Dtos/Snapshot/StatisticsDto.cs

@@ -183,17 +183,17 @@ public class SnapshotStatisticsOutDto
     /// <summary>
     /// 网格员应发奖励金额
     /// </summary>
-    public float WGYYFJLJE { get; set; }
+    public double? WGYYFJLJE { get; set; }
 
     /// <summary>
     /// 网格员已发放奖励总额
     /// </summary>
-    public float WGYYFFJLZE { get; set; }
+    public double? WGYYFFJLZE { get; set; }
 
     /// <summary>
     /// 网格员待发放奖励总额
     /// </summary>
-    public float WGYDFFJLZE { get; set; }
+    public double? WGYDFFJLZE { get; set; }
 
     /// <summary>
     /// 网格员扣款总额(已发)