检验项目增加收费性质，锅炉的添加检验项目增加过滤

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilerconnectrecordreport/vo/BoilerConnectRecordReportPageReqVO.java

@@ -85,4 +85,7 @@ public class BoilerConnectRecordReportPageReqVO extends PageParam {
      */
     @Schema(description = "是否收费")
     private String isFee;
+
+    @Schema(description = "收费性质（1=法定收费, 2=服务收费，多个用逗号分隔）")
+    private String chargeNature;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilerconnectrecordreport/vo/BoilerConnectRecordReportRespVO.java

@@ -97,4 +97,8 @@ public class BoilerConnectRecordReportRespVO {
 
     @Schema(description = "是否收费")
     private String isFee;
+
+    @Schema(description = "收费性质（1=法定收费, 2=服务收费，多个用逗号分隔）")
+    @ExcelProperty("收费性质")
+    private String chargeNature;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilerconnectrecordreport/vo/BoilerConnectRecordReportSaveReqVO.java

@@ -73,4 +73,7 @@ public class BoilerConnectRecordReportSaveReqVO {
      */
     @Schema(description = "是否收费")
     private String isFee;
+
+    @Schema(description = "收费性质（1=法定收费, 2=服务收费，多个用逗号分隔）")
+    private String chargeNature;
 }

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

@@ -76,6 +76,9 @@ public class BoilerOrderItemCostInfoRepsVO {
     @Schema(description = "是否收费")
     private String isFee;
 
+    @Schema(description = "收费性质（1=法定收费, 2=服务收费，多个用逗号分隔）")
+    private String chargeNature;
+
     /**
      * 序号
      */

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/boilerconnectrecordreport/BoilerConnectRecordReportDO.java

@@ -95,6 +95,11 @@ public class BoilerConnectRecordReportDO extends BaseDO {
      */
     private String isFee;
 
+    /**
+     * 收费性质（1=法定收费, 2=服务收费，多个用逗号分隔）
+     */
+    private String chargeNature;
+
     public String isMain(){
         return String.valueOf("MAIN".equals(this.projectType));
     }

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

@@ -1440,6 +1440,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                             repsVO.setIsMainProject("MAIN".equals(connectRecordReportDO.getProjectType()) ? "1" : "0");
                             repsVO.setDefaultCount(natureTemplateDO.getDefaultCount() != null ? natureTemplateDO.getDefaultCount() : 1);
                             repsVO.setSort(natureTemplateDO.getSort() != null ? natureTemplateDO.getSort() : 1);
+                            repsVO.setChargeNature(connectRecordReportDO.getChargeNature());
                             return repsVO;
                         }else {
                             return null;
@@ -1461,6 +1462,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                                 repsVO.setIsMainProject("MAIN".equals(connectRecordReportDO.getProjectType()) ? "1" : "0");
                                 repsVO.setDefaultCount(natureTemplateDO.getDefaultCount() != null ? natureTemplateDO.getDefaultCount() : 1);
                                 repsVO.setSort(natureTemplateDO.getSort() != null ? natureTemplateDO.getSort() : 1);
+                                repsVO.setChargeNature(connectRecordReportDO.getChargeNature());
                                 return repsVO;
                             }else {
                                 return null;
@@ -3855,6 +3857,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         if ("1".equals(templateDO.getFeeCalcType())){
             vo.setFee(BigDecimal.ZERO);
         }
+        vo.setChargeNature(templateDO.getChargeNature());
         return vo;
     }