费用计算bug

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

@@ -46,4 +46,7 @@ public class BoilerOrderItemAddReportVO {
 
     @Schema(description = "排序", example = "1")
     private Integer sort;
+
+    @Schema(description = "费用计算json", example = "6822")
+    private String feeCalculateJson;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeOrderItemAddReportVO.java

@@ -53,4 +53,7 @@ public class PipeOrderItemAddReportVO {
 
     @Schema(description = "排序", example = "1")
     private Integer sort;
+
+    @Schema(description = "费用计算json", example = "6822")
+    private String feeCalculateJson;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilerconnectrecordreport/BoilerConnectRecordReportServiceImpl.java

@@ -83,6 +83,14 @@ public class BoilerConnectRecordReportServiceImpl extends ServiceImpl<BoilerConn
                 .set(BoilerConnectRecordReportDO::getProjectCode, updateObj.getProjectCode())
                 .set(BoilerConnectRecordReportDO::getAcceptOrderTemplateId, updateObj.getAcceptOrderTemplateId())
                 .set(BoilerConnectRecordReportDO::getFeeTypes, updateObj.getFeeTypes())
+                .set(BoilerConnectRecordReportDO::getFeeCalcType, updateObj.getFeeCalcType())
+                .set(BoilerConnectRecordReportDO::getFee, updateObj.getFee())
+                .set(BoilerConnectRecordReportDO::getFeeFileUrl, updateObj.getFeeFileUrl())
+                .set(BoilerConnectRecordReportDO::getProjectType, updateObj.getProjectType())
+                .set(BoilerConnectRecordReportDO::getOperationInstruction, updateObj.getOperationInstruction())
+                .set(BoilerConnectRecordReportDO::getApprovalCode, updateObj.getApprovalCode())
+                .set(BoilerConnectRecordReportDO::getIsSign, updateObj.getIsSign())
+                .set(BoilerConnectRecordReportDO::getIsFee, updateObj.getIsFee())
                 .set(BoilerConnectRecordReportDO::getStatus, updateObj.getStatus())
                         .eq(BoilerConnectRecordReportDO::getId, updateObj.getId()
         )

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

@@ -2750,6 +2750,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             }
             addReport.setItemPartId(itemPartId);
             addReport.setFeeType(vo.getType());
+            addReport.setFeeCalculateJson(vo.getFeeCalculateJson());
             // 非手动上传
             if (StringUtils.isBlank(vo.getManualUrl())) {
 

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

@@ -1602,6 +1602,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     }
                 }
                 addReport.setFeeType(vo.getType());
+                addReport.setFeeCalculateJson(vo.getFeeCalculateJson());
 
                 // 计算当前是第几个（从 1 开始）
                 int currentIndex = existingTemplateCount + i + 1;