feat：修改完成的取值逻辑

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

@@ -1,6 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.api.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
 /**
@@ -10,6 +11,7 @@ import lombok.Data;
  * @date 2025-01-06 11:24
  */
 @Data
+@ColumnWidth(24)
 public class TaskCheckExcelModel {
 
     @ExcelProperty("（服务商业务员）全部已提交服务包数量")

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

@@ -804,8 +804,6 @@ public class InitController {
         List<SysCheckChainNodeCheckHistory> all = checkChainNodeCheckHistoryService.list(Wrappers.<SysCheckChainNodeCheckHistory>lambdaQuery().orderByAsc(SysCheckChainNodeCheckHistory::getHistoryId));
 
 
-        // Map<Integer, List<SysCheckChainNodeCheckHistory>> nodeId2HisMap = all.stream().collect(Collectors.groupingBy(SysCheckChainNodeCheckHistory::getNodeId));
-
         Map<Integer, List<SysCheckChainNodeCheckHistory>> taskId2HisMap = all.stream().collect(Collectors.groupingBy(SysCheckChainNodeCheckHistory::getTargetId));
 
 
@@ -922,37 +920,40 @@ public class InitController {
         taskCheckExcelModel.setPkgCount(String.valueOf(pkgCount));
         taskCheckExcelModel.setTaskCount(String.valueOf(taskCount));
 
+        Map<Integer, List<SysCheckChainNodeCheckHistory>> nodeId2HisMap = all.stream().collect(Collectors.groupingBy(SysCheckChainNodeCheckHistory::getNodeId));
+        long okCount = nodeId2HisMap.get(6).stream().mapToInt(SysCheckChainNodeCheckHistory::getTargetId).distinct().count();
+
         int unfinishedCount = vendorUnfinishedCount + cityUnfinishedCount + provUnfinishedCount + marketUnfinishedCount + bizUnfinishedCount + leaderUnfinishedCount + mgrUnfinishedCount;
-        taskCheckExcelModel.setFinishTaskCount(String.valueOf(taskCount - unfinishedCount));
+        taskCheckExcelModel.setFinishTaskCount(String.valueOf(okCount));
         taskCheckExcelModel.setUnfinishedTaskCount(String.valueOf(unfinishedCount));
 
         // 服务商
         taskCheckExcelModel.setVendorUnfinishedTaskCount(String.valueOf(vendorUnfinishedCount));
-        taskCheckExcelModel.setVendorUnfinishedAvgTime(String.valueOf(vendorUnfinishedTime));
+        taskCheckExcelModel.setVendorUnfinishedAvgTime(String.format("%.2f", vendorUnfinishedTime * 1.0 / (60 * 60 * 24 * vendorUnfinishedCount)));
 
         // 地市
         taskCheckExcelModel.setCityUnfinishedTaskCount(String.valueOf(cityUnfinishedCount));
-        taskCheckExcelModel.setCityUnfinishedAvgTime(String.valueOf(cityUnfinishedTime));
+        taskCheckExcelModel.setCityUnfinishedAvgTime(String.format("%.2f", cityUnfinishedTime * 1.0 / (60 * 60 * 24 * cityUnfinishedCount)));
 
         // 区域
         taskCheckExcelModel.setProvinceUnfinishedTaskCount(String.valueOf(provUnfinishedCount));
-        taskCheckExcelModel.setProvinceUnfinishedAvgTime(String.valueOf(provUnfinishedTime));
+        taskCheckExcelModel.setProvinceUnfinishedAvgTime(String.format("%.2f", provUnfinishedTime * 1.0 / (60 * 60 * 24 * provUnfinishedCount)));
 
         // 市场
         taskCheckExcelModel.setMarketUnfinishedTaskCount(String.valueOf(marketUnfinishedCount));
-        taskCheckExcelModel.setMarketUnfinishedAvgTime(String.valueOf(marketUnfinishedTime));
+        taskCheckExcelModel.setMarketUnfinishedAvgTime(String.format("%.2f", marketUnfinishedTime * 1.0 / (60 * 60 * 24 * marketUnfinishedCount)));
 
         // 商务
         taskCheckExcelModel.setBizUnfinishedTaskCount(String.valueOf(bizUnfinishedCount));
-        taskCheckExcelModel.setBizUnfinishedAvgTime(String.valueOf(bizUnfinishedTime));
+        taskCheckExcelModel.setBizUnfinishedAvgTime(String.format("%.2f", bizUnfinishedTime * 1.0 / (60 * 60 * 24 * bizUnfinishedCount)));
 
         // 分管领导
         taskCheckExcelModel.setLeaderUnfinishedTaskCount(String.valueOf(leaderUnfinishedCount));
-        taskCheckExcelModel.setLeaderUnfinishedAvgTime(String.valueOf(leaderUnfinishedTime));
+        taskCheckExcelModel.setLeaderUnfinishedAvgTime(String.format("%.2f", leaderUnfinishedTime * 1.0 / (60 * 60 * 24 * leaderUnfinishedCount)));
 
         // 总经理
         taskCheckExcelModel.setManagerUnfinishedTaskCount(String.valueOf(mgrUnfinishedCount));
-        taskCheckExcelModel.setManagerUnfinishedAvgTime(String.valueOf(mgrUnfinishedTime));
+        taskCheckExcelModel.setManagerUnfinishedAvgTime(String.format("%.2f", mgrUnfinishedTime * 1.0 / (60 * 60 * 24 * mgrUnfinishedCount)));
         return Collections.singletonList(taskCheckExcelModel);
 
     }