minor fixes

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

@@ -45,7 +45,7 @@ public class WmScorePackageInfoExcelModel implements Serializable {
      * 父级执行包所属省份
      */
     @ColumnWidth(128)
-    @ExcelProperty("父级执行包所属省份")
+    @ExcelProperty("所属省份")
     private String parentPkgProvAbbr;
 
     /**

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

@@ -1162,6 +1162,7 @@ public class WmPackageManager {
       List<WmTask> tasks =
         taskService.list(
             Wrappers.<WmTask>lambdaQuery()
+                .eq(WmTask::getDelFlag, CommonConstants.STATUS_NORMAL) // filter 2099 rows
                 .in(
                     WmTask::getScorePackageId,
                     cPkgIdBatch));
@@ -1191,12 +1192,6 @@ public class WmPackageManager {
                       return cnt;
                     });
                   model.setTaskNumPlanned(Integer.toString(plannedQty));
-                  int actualQty = scope.parentId2PkgMap.getOrDefault(pkg.getId(), new ArrayList<>())
-                    .stream().mapToInt(Integer::parseInt).reduce(0, (cnt, cPkgId) -> {
-                      cnt += cPkg2TaskListMap.getOrDefault(Integer.toString(cPkgId), new ArrayList<>()).size();
-                      return cnt;
-                    });
-                  model.setTaskNumSubmitted(Integer.toString(actualQty));
                   
                   List<Map<String, Object>> checkList = pkg2CheckListMap.getOrDefault(pkg.getId(), new ArrayList<>());
                   if(CollUtil.isEmpty(checkList)) {
@@ -1217,6 +1212,12 @@ public class WmPackageManager {
                   int lastSeq = -1;
                   int lastSeq4Num = 1;
                   boolean lastRejected = true;
+                  checkList.add(
+                    Map.ofEntries(
+                      Map.entry("task_id", Integer.valueOf(-1)),
+                      Map.entry("node_id", Integer.valueOf(0)),
+                      Map.entry("seq", Integer.valueOf(0)),
+                      Map.entry("check_result", Integer.valueOf(0))));
                   for(Map<String, Object> record: checkList) {
                     int taskId = toInteger(record.get("task_id"));
                     int nodeId = toInteger(record.get("node_id"));
@@ -1236,7 +1237,10 @@ public class WmPackageManager {
                             todos[5] += 1;
                           } else if(lastSeq4Num % 9 == 0) {
                             todos[8] += 1;
-                          } else {
+                          } else if(lastSeq4Num % 8 == 0) {
+                            todos[9] += 1;
+                          } else { // treat as 3
+                            todos[8] += 1;
                             todos[9] += 1;
                           }
                         } else if(lastSeq == 3) {
@@ -1258,6 +1262,7 @@ public class WmPackageManager {
                     lastSeq4Num *= nodeId > 7 && checkResult == 1 ? nodeId : 1;
                   }
 
+                  model.setTaskNumSubmitted(Integer.toString(passed[1]));
                   model.setNode2PassedNum(Integer.toString(passed[2]));
                   model.setNode2RejectNum(Integer.toString(rejected[2]));
                   model.setNode2TodoNum(Integer.toString(todos[2]));

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysCheckChainNodeCheckHistoryMapper.xml

@@ -43,6 +43,7 @@
     JOIN sys_chain_node_check_his AS h
     ON t.id = h.target_id
     WHERE p.enable_flag = '0' 
+    AND t.del_flag = '0'
     AND p.relation_score_id IN
     <foreach collection="pkgIds" item="pkgId" open="(" close=")" separator=",">
       #{pkgId}