费用计算

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

@@ -139,8 +139,9 @@ public class BoilerConnectRecordReportServiceImpl extends ServiceImpl<BoilerConn
                     .eq(BoilerConnectRecordReportDO::getResultTemplateId, templateId)
                     .list();
         } else {
-            // 未知类型，返回空列表
-            return new ArrayList<>();
+            doList = this.lambdaQuery()
+                    .eq(BoilerConnectRecordReportDO::getId, templateId)
+                    .list();
         }
 
         // 如果为空直接返回

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

@@ -790,6 +790,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 //                      addReport1.setFee(ConversionUtil.convert(recordReportDO.getFee()));
                         addReport1.setFee(item.getFee());
                         addReport1.setFeeType(item.getType());
+                        addReport1.setFeeCalculateJson(item.getFeeCalculateJson());
                         addReport1.setOrderId(taskOrderDO.getId());
                         addReport1.setTaskStatus(500);
                         addReport1.setReportNo(reportNo);
@@ -813,6 +814,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 //                            addReport1.setFee(ConversionUtil.convert(recordReportDO.getFee()));
                             addReport1.setFee(item.getFee());
                             addReport1.setFeeType(item.getType());
+                            addReport1.setFeeCalculateJson(item.getFeeCalculateJson());
                             addReport1.setOrderId(taskOrderDO.getId());
                             addReport1.setTaskStatus(520);
                             addReport1.setReportNo(reportNo);

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

@@ -348,6 +348,7 @@ public class EquipBoilerSchedulingServiceImpl extends ServiceImpl<EquipBoilerSch
                     }else {
                         checkDO.setFee(BigDecimal.valueOf(0));
                     }
+                    checkDO.setFeeCalculateJson(checkItem.getFeeCalculateJson());
                     equipBoilerSchedulingCheckMapper.insert(checkDO);
                 });
             });

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

@@ -461,6 +461,7 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
                     }else {
                         checkDO.setFee(BigDecimal.valueOf(0));
                     }
+                    checkDO.setFeeCalculateJson(checkItem.getFeeCalculateJson());
                     equipPipeSchedulingCheckMapper.insert(checkDO);
                 });
             });

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

@@ -763,6 +763,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                             addReport1.setTemplateId(dynamicTbDO.getId());
                             addReport1.setFee(item.getFee());
                             addReport1.setFeeType(item.getType());
+                            addReport1.setFeeCalculateJson(item.getFeeCalculateJson());
                             addReport1.setOrderId(taskOrderDO.getId());
                             addReport1.setTaskStatus(500);
                             addReport1.setReportNo(reportNo);
@@ -782,6 +783,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                                 addReport1.setReportTemplateId(dynamicTbDO.getId());
                                 addReport1.setFee(item.getFee());
                                 addReport1.setFeeType(item.getType());
+                                addReport1.setFeeCalculateJson(item.getFeeCalculateJson());
                                 addReport1.setOrderId(taskOrderDO.getId());
                                 addReport1.setTaskStatus(520);
                                 addReport1.setReportNo(reportNo);