锅炉是否收费

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

@@ -3772,25 +3772,27 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         BoilerOrderItemCostInfoRepsVO vo = new BoilerOrderItemCostInfoRepsVO();
         vo.setProjectType(templateDO.getProjectType());
         //获取记录模板
-        if (templateDO.getRecordTemplateId() != null){
-        DynamicTbDO recordDO = dynamicTbMapper.selectById(templateDO.getRecordTemplateId());
-        vo.setOrderId(reqVO.getOrderId());
-        vo.setConnectId(templateDO.getId());
-        vo.setName(templateDO.getProjectName());
-        vo.setTemplateId(recordDO.getId());
-        vo.setIsAutoAmount("0");
-        //vo.setFormulaTemplateUrl(templateDO.getFormulaTemplateUrl());
-        vo.setReportType(recordDO.getTbType());
-        vo.setUse(Boolean.FALSE); // 默认值
+        if (templateDO.getRecordTemplateId() != null) {
+            DynamicTbDO recordDO = dynamicTbMapper.selectById(templateDO.getRecordTemplateId());
+            vo.setOrderId(reqVO.getOrderId());
+            vo.setConnectId(templateDO.getId());
+            vo.setName(templateDO.getProjectName());
+            vo.setTemplateId(recordDO.getId());
+            vo.setIsAutoAmount("0");
+            //vo.setFormulaTemplateUrl(templateDO.getFormulaTemplateUrl());
+            vo.setReportType(recordDO.getTbType());
+            vo.setUse(Boolean.FALSE); // 默认值
             // 将 String 类型的 fee 转换为 BigDecimal
             if (StringUtils.isNotBlank(templateDO.getFee())) {
                 vo.setFee(new BigDecimal(templateDO.getFee()));
             } else {
                 vo.setFee(BigDecimal.ZERO);
             }
-        //vo.setRecordTemplateUrl(templateDO.getRecordTemplateUrl());
-        //vo.setReportTemplateUrl(templateDO.getReportTemplateUrl());
-        }else if (templateDO.getReportTemplateId() != null){
+            vo.setIsFee(templateDO.getIsFee());
+            vo.setFee("1".equals(templateDO.getIsFee()) ? ConversionUtil.convert(templateDO.getFee()) : BigDecimal.ZERO);
+            //vo.setRecordTemplateUrl(templateDO.getRecordTemplateUrl());
+            //vo.setReportTemplateUrl(templateDO.getReportTemplateUrl());
+        } else if (templateDO.getReportTemplateId() != null) {
             DynamicTbDO recordDO = dynamicTbMapper.selectById(templateDO.getReportTemplateId());
             vo.setOrderId(reqVO.getOrderId());
             vo.setConnectId(templateDO.getId());
@@ -3805,6 +3807,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             } else {
                 vo.setFee(BigDecimal.ZERO);
             }
+            vo.setIsFee(templateDO.getIsFee());
+            vo.setFee("1".equals(templateDO.getIsFee()) ? ConversionUtil.convert(templateDO.getFee()) : BigDecimal.ZERO);
         }
         vo.setFeeCalcType(templateDO.getFeeCalcType());
         if ("1".equals(templateDO.getFeeCalcType())){