检验性质配置数量

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerOrderItemCostInfoRepsVO.java

@@ -69,4 +69,7 @@ public class BoilerOrderItemCostInfoRepsVO {
 
     @Schema(description = "是否主项目")
     private String isMainProject;
+
+    @Schema(description = "默认数量")
+    private Integer defaultCount;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipboilerscheduling/vo/BoilerPlanSchedulingCheckItemVO.java

@@ -23,4 +23,7 @@ public class BoilerPlanSchedulingCheckItemVO {
 
     @Schema(description = "类型 1 法定 2 服务")
     private String type;
+
+    @Schema(description = "默认数量")
+    private Integer defaultCount;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/inspectionnature/vo/InspectionNatureTemplateDetailRespVO.java

@@ -61,4 +61,7 @@ public class InspectionNatureTemplateDetailRespVO {
     private String part;
 
     private String projectType;
+
+    @Schema(description = "默认数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Integer defaultCount;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/inspectionnature/vo/InspectionNatureTemplateSaveReqVO.java

@@ -25,4 +25,7 @@ public class InspectionNatureTemplateSaveReqVO {
     @Schema(description = "部件")
     private String part;
 
+    @Schema(description = "默认数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Integer defaultCount;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/equipboilerschedulingitem/EquipBoilerSchedulingCheckDO.java

@@ -73,4 +73,9 @@ public class EquipBoilerSchedulingCheckDO extends BaseDO {
      * 类型 1 法定 2 服务
      */
     private String type;
+
+    /**
+     * 默认数量
+     */
+    private Integer defaultCount;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/equippipeschedulingitem/EquipPipeSchedulingCheckDO.java

@@ -72,4 +72,9 @@ public class EquipPipeSchedulingCheckDO extends BaseDO {
      * 类型 1 法定 2 服务
      */
     private String type;
+
+    /**
+     * 默认数量
+     */
+    private Integer defaultCount;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/inspectionnature/InspectionNatureTemplateDO.java

@@ -36,8 +36,13 @@ public class InspectionNatureTemplateDO extends BaseDO {
      */
     private String templateId;
     /**
-     * 设备类型
+     * 是否默认
      */
     private String isDefault;
 
+    /**
+     * 默认数量
+     */
+    private Integer defaultCount;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -882,6 +882,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             final String[] reportNo = {generateOrderItemSubReportNo(taskOrderDO.getDeptId(), taskOrderDO.getCheckDate(), projectCode)};
 
             checkDOList.forEach(item -> {
+                int count = item.getDefaultCount() != null ? item.getDefaultCount() : 1;
+                for (int c = 0; c < count; c++) {
                 //生成检验项目
                 if (item.getCheckId() != null){
 
@@ -999,6 +1001,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
                     }
                 }
+                }
             });
 
             if (!insertList.isEmpty()){
@@ -1397,6 +1400,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                             repsVO.setUse("1".equals(natureTemplateDO.getIsDefault())); // 默认值
                             repsVO.setProjectType(connectRecordReportDO.getProjectType());
                             repsVO.setIsMainProject("MAIN".equals(connectRecordReportDO.getProjectType()) ? "1" : "0");
+                            repsVO.setDefaultCount(natureTemplateDO.getDefaultCount() != null ? natureTemplateDO.getDefaultCount() : 1);
                             return repsVO;
                         }else {
                             return null;
@@ -1415,6 +1419,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                                 repsVO.setUse("1".equals(natureTemplateDO.getIsDefault())); // 默认值
                                 repsVO.setProjectType(connectRecordReportDO.getProjectType());
                                 repsVO.setIsMainProject("MAIN".equals(connectRecordReportDO.getProjectType()) ? "1" : "0");
+                                repsVO.setDefaultCount(natureTemplateDO.getDefaultCount() != null ? natureTemplateDO.getDefaultCount() : 1);
                                 return repsVO;
                             }else {
                                 return null;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equipboilerscheduling/EquipBoilerSchedulingServiceImpl.java

@@ -355,6 +355,7 @@ public class EquipBoilerSchedulingServiceImpl extends ServiceImpl<EquipBoilerSch
                         checkDO.setFee(BigDecimal.valueOf(0));
                     }
                     checkDO.setFeeCalculateJson(checkItem.getFeeCalculateJson());
+                    checkDO.setDefaultCount(checkItem.getDefaultCount() != null ? checkItem.getDefaultCount() : 1);
                     equipBoilerSchedulingCheckMapper.insert(checkDO);
                 });
             });

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipescheduling/EquipPipeSchedulingServiceImpl.java

@@ -477,6 +477,7 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
                         checkDO.setFee(BigDecimal.valueOf(0));
                     }
                     checkDO.setFeeCalculateJson(checkItem.getFeeCalculateJson());
+                    checkDO.setDefaultCount(checkItem.getDefaultCount() != null ? checkItem.getDefaultCount() : 1);
                     equipPipeSchedulingCheckMapper.insert(checkDO);
                 });
             });

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -852,6 +852,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             String reportNo = generateOrderItemSubReportNo(taskOrderDO.getDeptId(),taskOrderDO.getCheckDate(),projectCode);
 
             checkDOList.forEach(item -> {
+                int count = item.getDefaultCount() != null ? item.getDefaultCount() : 1;
+                for (int c = 0; c < count; c++) {
                 //生成检验项目
                 if (item.getCheckId() != null){
 
@@ -973,6 +975,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     }
 
                 }
+                }
             });
 
             if (!insertList.isEmpty()){
@@ -1398,6 +1401,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                             repsVO.setUse("1".equals(natureTemplateDO.getIsDefault())); // 默认值
                             repsVO.setProjectType(connectRecordReportDO.getProjectType());
                             repsVO.setIsMainProject("MAIN".equals(connectRecordReportDO.getProjectType()) ? "1" : "0");
+                            repsVO.setDefaultCount(natureTemplateDO.getDefaultCount() != null ? natureTemplateDO.getDefaultCount() : 1);
                             return repsVO;
                         }else {
                             return null;
@@ -1416,6 +1420,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                                 repsVO.setUse("1".equals(natureTemplateDO.getIsDefault())); // 默认值
                                 repsVO.setProjectType(connectRecordReportDO.getProjectType());
                                 repsVO.setIsMainProject("MAIN".equals(connectRecordReportDO.getProjectType()) ? "1" : "0");
+                                repsVO.setDefaultCount(natureTemplateDO.getDefaultCount() != null ? natureTemplateDO.getDefaultCount() : 1);
                                 return repsVO;
                             }else {
                                 return null;