shc 6 месяцев назад
Родитель
Сommit
7e23df3b24

+ 7 - 0
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/TaskCheckExcelModel.java

@@ -47,6 +47,13 @@ public class TaskCheckExcelModel {
     @ExcelProperty("事业部区域经理平均待审核时间")
     private String provinceUnfinishedAvgTime;
 
+    // 待事业部审核
+    @ExcelProperty("事业部商务或市场待审核数量")
+    private String deptUnfinishedTaskCount;
+
+    @ExcelProperty("事业部商务或市场平均待审核时间")
+    private String deptUnfinishedAvgTime;
+
     // 市场组
     @ExcelProperty("事业部市场组待审核数量")
     private String marketUnfinishedTaskCount;

+ 10 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/InitController.java

@@ -816,6 +816,10 @@ public class InitController {
         int provUnfinishedCount = 0;
         long provUnfinishedTime = 0L;
 
+        int deptUnfinishedCount = 0;
+        long deptUnfinishedTime = 0L;
+
+
         int marketUnfinishedCount = 0;
         long marketUnfinishedTime = 0L;
 
@@ -870,11 +874,10 @@ public class InitController {
 
                         // 市场组和商务组都没有审核
                         if (CollUtil.isNotEmpty(bizDeptHis)) {
-                            marketUnfinishedCount += bizDeptHis.size();
-                            bizUnfinishedCount += bizDeptHis.size();
+
+                            deptUnfinishedCount += bizDeptHis.size();
                             long seconds = Duration.between(task.getCreateTime(), endTime).getSeconds();
-                            marketUnfinishedTime += seconds;
-                            bizUnfinishedTime += seconds;
+                            deptUnfinishedTime += seconds;
                         }
 
                         // 判断市场组是否审核
@@ -939,6 +942,9 @@ public class InitController {
         taskCheckExcelModel.setProvinceUnfinishedTaskCount(String.valueOf(provUnfinishedCount));
         taskCheckExcelModel.setProvinceUnfinishedAvgTime(String.format("%.2f", provUnfinishedTime * 1.0 / (60 * 60 * 24 * provUnfinishedCount)));
 
+        taskCheckExcelModel.setDeptUnfinishedTaskCount(String.valueOf(deptUnfinishedCount));
+        taskCheckExcelModel.setDeptUnfinishedAvgTime(String.format("%.2f", deptUnfinishedTime * 1.0 / (60 * 60 * 24 * deptUnfinishedCount)));
+
         // 市场
         taskCheckExcelModel.setMarketUnfinishedTaskCount(String.valueOf(marketUnfinishedCount));
         taskCheckExcelModel.setMarketUnfinishedAvgTime(String.format("%.2f", marketUnfinishedTime * 1.0 / (60 * 60 * 24 * marketUnfinishedCount)));