任务单修改设备后同步报表

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12116_202400RecordOFData.java

@@ -83,6 +83,9 @@ public class QC12116_202400RecordOFData implements IDynamicOFData {
 
         if (itemReportDO != null){
 
+            //一览表生成时先删除所有值，防止设备不对
+            dynamicTbValService.deleteDynamicTbValByRefId(refId);
+
             PipeTaskOrderItemDO itemDO = pipeTaskOrderItemMapper.selectById(orderItemId);
             if (itemDO != null){
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictbval/DynamicTbValService.java

@@ -60,4 +60,6 @@ public interface DynamicTbValService extends IService<DynamicTbValDO>  {
     List<DynamicTbValDO> getDynamicTbValByRefId(String refId);
 
     DynamicTBAndColVO getDynamicTbInsAndValByRefId(DynamicTBViewOrAddVO tbViewOrAddVO);
+
+    void deleteDynamicTbValByRefId(String refId);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictbval/DynamicTbValServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.pressure2.service.dynamictbval;
 
 import cn.hutool.core.util.StrUtil;
+import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.module.pressure2.controller.admin.dynamictb.vo.DynamicTbRespVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbcol.vo.DynamicTbColRespVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
@@ -10,6 +11,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.dynamictbcol.DynamicTbColDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictb.DynamicTbMapper;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictbcol.DynamicTbColMapper;
+import cn.start.tz.module.pressure2.dal.mysql.dynamictbins.DynamicTbInsMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.pressure2.util.OFDataUtils;
@@ -59,6 +61,10 @@ public class DynamicTbValServiceImpl extends ServiceImpl<DynamicTbValMapper, Dyn
 
     @Resource
     private DynamicTbMapper dynamicTbMapper;
+
+    @Resource
+    private DynamicTbInsMapper dynamicTbInsMapper;
+
     @Autowired
     OFDataUtils ofDataUtils;
 
@@ -191,6 +197,15 @@ public class DynamicTbValServiceImpl extends ServiceImpl<DynamicTbValMapper, Dyn
                 .orElse(Collections.emptyList());
     }
 
+    @Override
+    public void deleteDynamicTbValByRefId(String refId) {
+        DynamicTbInsDO dynamicTbInsDO = dynamicTbInsMapper.selectOne(DynamicTbInsDO::getRefId, refId);
+        if (dynamicTbInsDO != null){
+            dynamicTbValMapper.delete(new LambdaQueryWrapper<DynamicTbValDO>()
+                    .eq(DynamicTbValDO::getInsId, dynamicTbInsDO.getId()));
+        }
+    }
+
     /*@Override
     public DynamicTBAndColVO getDynamicTbInsAndValByRefId(DynamicTBViewOrAddVO tbViewOrAddVO) {
         DynamicTBAndColVO result = new DynamicTBAndColVO();

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

@@ -1975,6 +1975,11 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         //修改金额
         this.updateOrderFee(id);
+
+        //同步报表
+        PipeTaskOrderSyncReportVO reqVO = new PipeTaskOrderSyncReportVO();
+        reqVO.setOrderId(id);
+        this.syncAllReportDataByOrderId(reqVO);
         
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemsuspend/PipeTaskOrderItemSuspendServiceImpl.java

@@ -3,6 +3,7 @@ package cn.start.tz.module.pressure2.service.pipetaskorderitemsuspend;
 import cn.hutool.core.collection.CollUtil;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.dal.dataobject.appointmentconfirmorderrefuseitem.AppointmentConfirmOrderRefuseItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.appointmentconfirmrefuseyearitem.AppointmentConfirmRefuseYearItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
@@ -344,6 +345,10 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
             updateDO.setEquipNum(Math.toIntExact(count));
             //修改金额
             taskOrderService.updateOrderFee(orderId.get());
+            //同步报表
+            PipeTaskOrderSyncReportVO reqVO = new PipeTaskOrderSyncReportVO();
+            reqVO.setOrderId(orderId.get());
+            taskOrderService.syncAllReportDataByOrderId(reqVO);
         }
         taskOrderMapper.updateById(updateDO);