费用计算bug

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

@@ -63,4 +63,7 @@ public class BoilerOrderItemCostInfoRepsVO {
 
     @Schema(description = "是否主项目", example = "1")
     private String isMainProject;
+
+    @Schema(description = "费用计算类型", example = "1")
+    private String feeCalcType;
 }

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

@@ -2777,7 +2777,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         taskOrderDO.setAcceptOrderId(acceptOrderDO.getId());
         taskOrderDO.setEquipMainType(200); //200锅炉
         BigDecimal actualAmount = acceptOrderDO.getShouldAmount().add(acceptOrderDO.getServiceAmount());
-        taskOrderDO.setActualAmount(actualAmount.multiply(BigDecimal.valueOf(acceptOrderItemDOS.size())));
+        taskOrderDO.setActualAmount(actualAmount);
         //获取约检确认单计划id
         AppointmentConfirmOrderDO appointmentConfirmOrderDO = appointmentConfirmOrderMapper.selectById(acceptOrderDO.getAppointmentId());
         if (ObjectUtil.isNotEmpty(appointmentConfirmOrderDO)) {
@@ -2988,6 +2988,10 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 vo.setFee(BigDecimal.ZERO);
             }
         }
+        vo.setFeeCalcType(templateDO.getFeeCalcType());
+        if ("1".equals(templateDO.getFeeCalcType())){
+            vo.setFee(BigDecimal.ZERO);
+        }
         return vo;
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictbfeecol/DynamicTbFeeColServiceImpl.java

@@ -41,7 +41,7 @@ public class DynamicTbFeeColServiceImpl extends ServiceImpl<DynamicTbFeeColMappe
         // 插入
         DynamicTbFeeColDO dynamicTbFeeCol = BeanUtils.toBean(createReqVO, DynamicTbFeeColDO.class);
         // 校验code 唯一
-        validateDynamicTbFeeColCodeExists(createReqVO.getCode());
+        validateDynamicTbFeeColCodeExists(createReqVO.getCode(), null);
         dynamicTbFeeColMapper.insert(dynamicTbFeeCol);
         // 返回
         return dynamicTbFeeCol.getId();
@@ -52,7 +52,7 @@ public class DynamicTbFeeColServiceImpl extends ServiceImpl<DynamicTbFeeColMappe
         // 校验存在
         validateDynamicTbFeeColExists(updateReqVO.getId());
         // 校验code 唯一
-        validateDynamicTbFeeColExists(updateReqVO.getCode());
+        validateDynamicTbFeeColCodeExists(updateReqVO.getCode(), updateReqVO.getId());
         // 更新
         DynamicTbFeeColDO updateObj = BeanUtils.toBean(updateReqVO, DynamicTbFeeColDO.class);
         dynamicTbFeeColMapper.updateById(updateObj);
@@ -72,8 +72,12 @@ public class DynamicTbFeeColServiceImpl extends ServiceImpl<DynamicTbFeeColMappe
         }
     }
 
-    private void validateDynamicTbFeeColCodeExists(String code) {
-        if (dynamicTbFeeColMapper.selectOne(new LambdaQueryWrapper<DynamicTbFeeColDO>().eq(DynamicTbFeeColDO::getCode, code)) != null) {
+    private void validateDynamicTbFeeColCodeExists(String code, String id) {
+        LambdaQueryWrapper<DynamicTbFeeColDO> queryWrapper = new LambdaQueryWrapper<DynamicTbFeeColDO>().eq(DynamicTbFeeColDO::getCode, code);
+        if (id != null) {
+            queryWrapper.ne(DynamicTbFeeColDO::getId, id);
+        }
+        if (dynamicTbFeeColMapper.selectOne(queryWrapper) != null) {
             throw exception(DYNAMIC_TB_FEE_COL_CODE_EXISTS);
         }
     }

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

@@ -2036,7 +2036,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             taskOrderDO.setSchedulingId(appointmentConfirmOrderDO.getSchedulingId());
         }
         BigDecimal actualAmount = acceptOrderDO.getShouldAmount().add(acceptOrderDO.getServiceAmount());
-        taskOrderDO.setActualAmount(actualAmount.multiply(new BigDecimal(acceptOrderItemDOS.size())));
+        taskOrderDO.setActualAmount(actualAmount);
         // 任务单
         pipeTaskOrderMapper.insert(taskOrderDO);