xzc 18 órája
szülő
commit
56a3277567

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

@@ -3285,7 +3285,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 }
             }
             // 金额发生变动,将受理单签名置空,判断全部金额都要和之前不一致
-            if (ObjectUtil.notEqual(shouldAmount, boilerTaskOrderDO.getShouldAmount()) || ObjectUtil.notEqual(serviceAmount, boilerTaskOrderDO.getServiceAmount()) || ObjectUtil.notEqual(reduceFee, boilerTaskOrderDO.getReduceFee()) || ObjectUtil.notEqual(orderFee, boilerTaskOrderDO.getActualAmount())) {
+            if (!"1".equals(boilerTaskOrderDO.getIsSync()) && ObjectUtil.notEqual(shouldAmount, boilerTaskOrderDO.getShouldAmount()) || ObjectUtil.notEqual(serviceAmount, boilerTaskOrderDO.getServiceAmount()) || ObjectUtil.notEqual(reduceFee, boilerTaskOrderDO.getReduceFee()) || ObjectUtil.notEqual(orderFee, boilerTaskOrderDO.getActualAmount())) {
                 orderReportService.updateFeeBoiler(id);
 
                 // 金额发送变化

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

@@ -2366,7 +2366,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 }
             }
             // 金额发生变动,将受理单签名置空,判断全部金额都要和之前不一致
-            if (ObjectUtil.notEqual(shouldAmount, pipeTaskOrderDO.getShouldAmount()) || ObjectUtil.notEqual(serviceAmount, pipeTaskOrderDO.getServiceAmount()) || ObjectUtil.notEqual(reduceFee, pipeTaskOrderDO.getReduceFee()) || ObjectUtil.notEqual(orderFee, pipeTaskOrderDO.getActualAmount())) {
+            if (!"1".equals(pipeTaskOrderDO.getIsSync()) && ObjectUtil.notEqual(shouldAmount, pipeTaskOrderDO.getShouldAmount()) || ObjectUtil.notEqual(serviceAmount, pipeTaskOrderDO.getServiceAmount()) || ObjectUtil.notEqual(reduceFee, pipeTaskOrderDO.getReduceFee()) || ObjectUtil.notEqual(orderFee, pipeTaskOrderDO.getActualAmount())) {
                 orderReportService.updateFeePipe(id);
 
                 // 金额发送变化