feat：运营导出数据，显示拒绝总数

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

@@ -103,6 +103,14 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("基础拜访（已完成审批）")
     private String tt53checked;
 
+
+    /**
+     * 基础拜访（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("基础拜访（已拒绝）")
+    private String tt53rejected;
+
     // ～52============================
 
 
@@ -129,6 +137,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("专项拜访（已完成审批）")
     private String tt52checked;
 
+    /**
+     * 基础拜访（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("专项拜访（已拒绝）")
+    private String tt52rejected;
+
     // ～51============================
 
 
@@ -155,6 +170,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("专业拜访（已完成审批）")
     private String tt51checked;
 
+    /**
+     * 专业拜访（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("专业拜访（已拒绝）")
+    private String tt51rejected;
+
 
     // ～14============================
 
@@ -182,6 +204,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("数据收集（已完成审批）")
     private String tt14checked;
 
+    /**
+     * 数据收集（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("数据收集（已拒绝）")
+    private String tt14rejected;
+
 
     // ～17============================
 
@@ -209,6 +238,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("医学警戒信息收集（已完成审批）")
     private String tt17checked;
 
+    /**
+     * 医学警戒信息收集（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("医学警戒信息收集（已拒绝）")
+    private String tt17rejected;
+
     // ～12============================
 
 
@@ -235,6 +271,14 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("产品展示（已完成审批）")
     private String tt12Checked;
 
+    /**
+     * 产品展示（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("产品展示（已拒绝）")
+    private String tt12rejected;
+
+
 
     // ～13============================
 
@@ -262,6 +306,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("业务宣传服务（已完成审批）")
     private String tt13checked;
 
+    /**
+     * 业务宣传服务（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("业务宣传服务（已拒绝）")
+    private String tt13rejected;
+
     // ～1============================
 
 
@@ -288,6 +339,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("POV科室会（已完成审批）")
     private String tt1checked;
 
+    /**
+     * POV科室会（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("POV科室会（已拒绝）")
+    private String tt1rejected;
+
 
     // ～2============================
 
@@ -315,6 +373,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("区县学术会议（已完成审批）")
     private String tt2checked;
 
+    /**
+     * 区县学术会议（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("区县学术会议（已拒绝）")
+    private String tt2rejected;
+
     // ～5============================
 
 
@@ -341,6 +406,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("沙龙会（已完成审批）")
     private String tt5checked;
 
+    /**
+     * 沙龙会（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("沙龙会（已拒绝）")
+    private String tt5rejected;
+
     // ～3============================
 
 
@@ -367,6 +439,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("市级学术会议（已完成审批）")
     private String tt3checked;
 
+    /**
+     * 市级学术会议（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("市级学术会议（已拒绝）")
+    private String tt3rejected;
+
     // ～4============================
 
 
@@ -393,6 +472,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("省级学术会议（已完成审批）")
     private String tt4checked;
 
+    /**
+     * 省级学术会议（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("省级学术会议（已拒绝）")
+    private String tt4rejected;
+
     // ～64============================
 
 
@@ -419,6 +505,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("线上学术会议（已完成审批）")
     private String tt64checked;
 
+    /**
+     * 线上学术会议（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("线上学术会议（已拒绝）")
+    private String tt64rejected;
+
     // ～19============================
 
 
@@ -445,4 +538,11 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("健康教育课堂（已完成审批）")
     private String tt19checked;
 
+    /**
+     * 健康教育课堂（已拒绝）
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("健康教育课堂（已拒绝）")
+    private String tt19rejected;
+
 }

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

@@ -527,8 +527,8 @@ public class WmPackageManager {
                 childrenPkgs.stream().collect(Collectors.groupingBy(WmScorePackage::getRelationScoreId, Collectors.mapping(WmScorePackage::getId, Collectors.toList())));
 
         // 获取全部的任务
-        // List<WmTask> tasks = taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId, cPkgIds)/*.ne(WmTask::getTaskStatus, UpmsState.TaskState.REJECTED)*/);
-        List<WmTask> tasks = taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId, cPkgIds).ne(WmTask::getTaskStatus, UpmsState.TaskState.REJECTED));
+        List<WmTask> tasks = taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId, cPkgIds)/*.ne(WmTask::getTaskStatus, UpmsState.TaskState.REJECTED)*/);
+        // List<WmTask> tasks = taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId, cPkgIds).ne(WmTask::getTaskStatus, UpmsState.TaskState.REJECTED));
 
         // 根据任务类型id分组
         Map<String, List<WmTask>> pkg2TaskListMap = tasks.stream().collect(Collectors.groupingBy(WmTask::getScorePackageId));
@@ -571,7 +571,7 @@ public class WmPackageManager {
             // 任务数据统计
             if (CollUtil.isNotEmpty(cPkgIdList)) {
 
-
+                // 任务提交总数
                 int tt53Submit = 0;
                 int tt52submit = 0;
                 int tt51submit = 0;
@@ -587,6 +587,22 @@ public class WmPackageManager {
                 int tt64submit = 0;
                 int tt19submit = 0;
 
+                // 任务拒绝记录
+                int tt53rejected = 0;
+                int tt52rejected = 0;
+                int tt51rejected = 0;
+                int tt14rejected = 0;
+                int tt17rejected = 0;
+                int tt12rejected = 0;
+                int tt13rejected = 0;
+                int tt1rejected = 0;
+                int tt2rejected = 0;
+                int tt5rejected = 0;
+                int tt3rejected = 0;
+                int tt4rejected = 0;
+                int tt64rejected = 0;
+                int tt19rejected = 0;
+
 
                 for (String cPkgId : cPkgIdList) {
 
@@ -597,62 +613,109 @@ public class WmPackageManager {
                     }
 
                     for (WmTask task : list) {
+
+                        boolean rejected = UpmsState.TaskState.REJECTED.getState().equals(task.getTaskStatus());
+
                         String taskTypeId = task.getTaskTypeId();
 
                         if (StrUtil.equals(taskTypeId, "53")) {
                             tt53Submit++;
+
+                            if (rejected) {
+                                tt53rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "52")) {
                             tt52submit++;
+
+                            if (rejected) {
+                                tt52rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "51")) {
                             tt51submit++;
+                            if (rejected) {
+                                tt51rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "14")) {
                             tt14submit++;
+                            if (rejected) {
+                                tt14rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "17")) {
                             tt17submit++;
+                            if (rejected) {
+                                tt17rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "12")) {
                             tt12submit++;
+                            if (rejected) {
+                                tt12rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "13")) {
                             tt13submit++;
+                            if (rejected) {
+                                tt13rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "1")) {
                             tt1submit++;
+                            if (rejected) {
+                                tt1rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "2")) {
                             tt2submit++;
+                            if (rejected) {
+                                tt2rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "5")) {
                             tt5submit++;
+                            if (rejected) {
+                                tt5rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "3")) {
                             tt3submit++;
+                            if (rejected) {
+                                tt3rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "4")) {
                             tt4submit++;
+                            if (rejected) {
+                                tt4rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "64")) {
                             tt64submit++;
+                            if (rejected) {
+                                tt64rejected++;
+                            }
                         }
 
                         if (StrUtil.equals(taskTypeId, "19")) {
                             tt19submit++;
+                            if (rejected) {
+                                tt19rejected++;
+                            }
                         }
                     }
 
@@ -673,6 +736,21 @@ public class WmPackageManager {
                 model.setTt64submit(String.valueOf(tt64submit));
                 model.setTt19submit(String.valueOf(tt19submit));
 
+                model.setTt53rejected(String.valueOf(tt53rejected));
+                model.setTt52rejected(String.valueOf(tt52rejected));
+                model.setTt51rejected(String.valueOf(tt51rejected));
+                model.setTt14rejected(String.valueOf(tt14rejected));
+                model.setTt17rejected(String.valueOf(tt17rejected));
+                model.setTt12rejected(String.valueOf(tt12rejected));
+                model.setTt13rejected(String.valueOf(tt13rejected));
+                model.setTt1rejected(String.valueOf(tt1rejected));
+                model.setTt2rejected(String.valueOf(tt2rejected));
+                model.setTt5rejected(String.valueOf(tt5rejected));
+                model.setTt3rejected(String.valueOf(tt3rejected));
+                model.setTt4rejected(String.valueOf(tt4rejected));
+                model.setTt64rejected(String.valueOf(tt64rejected));
+                model.setTt19rejected(String.valueOf(tt19rejected));
+
 
             }