feat: 统计页面 update

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysStatisticManager.java

@@ -359,7 +359,9 @@ public class SysStatisticManager {
                 // 获取子集
                 List<Integer> parentQrtPlanIds = qrtPlanList.stream().mapToInt(SysImplementPlan::getPlanId).boxed().distinct().sorted().collect(Collectors.toList());
 
-                List<SysImplementPlan> subQrtPlans = implementPlanService.list(Wrappers.<SysImplementPlan>lambdaQuery().in(SysImplementPlan::getParentId, parentQrtPlanIds));
+                List<SysImplementPlan> subQrtPlans = implementPlanService.list(Wrappers.<SysImplementPlan>lambdaQuery()
+                        .eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.PASSED)
+                        .in(SysImplementPlan::getParentId, parentQrtPlanIds));
 
                 if (CollUtil.isEmpty(subQrtPlans)) {
                     break;
@@ -850,7 +852,7 @@ public class SysStatisticManager {
                 userMap = new ArrayList<>(userList.size());
                 for (SysUser u : userList) {
                     String uId = u.getUserId().toString();
-                    Map<String, Object> uMap = new HashMap<>(11);
+                    Map<String, Object> uMap = new HashMap<>(13);
                     // 用户ID
                     uMap.put("userId", u.getUserId());
                     // 用户名
@@ -874,8 +876,8 @@ public class SysStatisticManager {
                     deptPkgScoreTotal += userPkgScoreTotal;
 
                     int taskPkgCount = 0;
-                    long taskScoreTotal = 0L;
-                    long passedScore = 0L;
+                    int taskScoreTotal = 0;
+                    int passedScore = 0;
                     int passedCount = 0;
                     List<WmTask> tasks = userId2TaskMap.get(uId);
                     if (CollUtil.isNotEmpty(tasks)) {
@@ -887,11 +889,13 @@ public class SysStatisticManager {
                         }
 
                         taskPkgCount = tasks.size();
-                        taskScoreTotal = tasks.stream().mapToLong(WmTask::getScore).sum();
+                        taskScoreTotal = tasks.stream().mapToInt(WmTask::getScore).sum();
                     }
 
                     // 审核通过值
                     uMap.put("passedScore", passedScore);
+                    uMap.put("passedCount", passedCount);
+                    uMap.put("taskPkgCount", taskPkgCount);
                     // 审核通过率
                     uMap.put("passedCountRate", taskPkgCount == 0 ? "0.00" : String.format("%.2f", 100.0 * (passedCount / taskPkgCount)));
                     // 审核通过百分比

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

@@ -486,7 +486,7 @@ public class WmPackageManager {
 
         // 获取区域发的包
         List<WmScorePackage> pkgs = scorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery()
-                .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE)
+                .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
                 .between(WmScorePackage::getCreateTime, startDate, endDate)
                 .in(WmScorePackage::getSendPackageDeptId, dis.keySet().stream().map(String::valueOf).sorted().collect(Collectors.toList())));
 
@@ -497,7 +497,7 @@ public class WmPackageManager {
         // 获取上级包
         List<String> ppid = pkgs.stream().map(WmScorePackage::getRelationScoreId).distinct().sorted().collect(Collectors.toList());
         Map<String, WmScorePackage> ppMap = scorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery()
-                .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE)
+                .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
                 .in(WmScorePackage::getId, ppid)).stream().collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
 
 
@@ -517,7 +517,7 @@ public class WmPackageManager {
 
         // 获取子集包
         List<WmScorePackage> childrenPkgs = scorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery()
-                .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE)
+                .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
                 .in(WmScorePackage::getRelationScoreId, pkgIds));
         List<String> cPkgIds = childrenPkgs.stream().map(WmScorePackage::getId).distinct().sorted().collect(Collectors.toList());
         // 父级下的所有子集

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1520,6 +1520,12 @@ public class WmSupervisionManager {
 
         // 获取监督意见
         List<Long> supIds = taskSupervisions.stream().mapToLong(WmTaskSupervision::getSupervisionId).boxed().distinct().sorted().collect(Collectors.toList());
+
+        if (CollUtil.isEmpty(supIds)) {
+            throw new BizException("当前操作人不存在监督记录，不能导出");
+        }
+
+
         Map<Long, List<WmTaskSupervisionAdvice>> advices = taskSupervisionAdviceService.list(Wrappers.<WmTaskSupervisionAdvice>lambdaQuery().in(WmTaskSupervisionAdvice::getTaskSupervisionId, supIds)).stream().collect(Collectors.groupingBy(WmTaskSupervisionAdvice::getTaskSupervisionId));