Merge remote-tracking branch 'origin/featCnbg-checkExport-20250221' into cnbg-master

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

@@ -107,4 +107,6 @@ public class WmScorePackageCheckStatusExcelModel implements Serializable {
     @ExcelProperty(value = {"当前汇总", "审批拒绝数"})
     private String allRejectNum;
 
+    @ExcelProperty(value = {"包ID"})
+    private String pkgId;
 }

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

@@ -1295,6 +1295,7 @@ public class WmPackageManager {
                   }
                   model.setAllRejectNum(Integer.toString(rejected[2]+rejected[3]+rejected[8]+rejected[9]+rejected[5]+rejected[6]));
                   model.setAlllTodoNum(Integer.toString(todos[2]+todos[3]+todos[8]+todos[9]+todos[5]+todos[6]));
+                  model.setPkgId(pkg.getId());
                   return model;
                 }
             ).forEach(model -> {result.add(model); });

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

@@ -44,7 +44,6 @@
     ON t.id = h.target_id
     WHERE p.enable_flag = '0' 
     AND t.del_flag = '0'
-    AND t.id not in (select * from ops_miss_node)
     AND p.relation_score_id IN
     <foreach collection="pkgIds" item="pkgId" open="(" close=")" separator=",">
       #{pkgId}