任务单修改检验时间和检验员，同步修改受理单

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

@@ -37,6 +37,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreportuser.PipeTaskOrderItemReportUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderuser.PipeTaskOrderUserDO;
+import cn.start.tz.module.pressure2.dal.mysql.boileracceptorderuser.BoilerAcceptOrderUserMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilerconnectrecordreport.BoilerConnectRecordReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.businessmemberrelation.BusinessMemberRelationMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderuser.PipeTaskOrderUserMapper;
@@ -246,6 +247,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
     @Resource
     private BoilerTaskOrderUserMapper boilerTaskOrderUserMapper;
 
+    @Resource
+    private BoilerAcceptOrderUserMapper boilerAcceptOrderUserMapper;
+
     @Resource
     private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
 
@@ -983,6 +987,20 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         boilerTaskOrderUserMapper.delete(BoilerTaskOrderUserDO::getOrderId,updateReqVO.getId());
         //添加新检验员
         boilerTaskOrderUserMapper.insertBatch(acceptOrderList);
+
+        BoilerTaskOrderDO boilerTaskOrderDO = boilerTaskOrderMapper.selectById(updateReqVO.getId());
+        // 修改受理单检验员
+
+        AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(boilerTaskOrderDO.getAcceptOrderId());
+        // 增加受理单用户
+        List<BoilerAcceptOrderUserDO> boilerAcceptOrderUserDOS = acceptOrderList.stream().map(item -> BoilerAcceptOrderUserDO.builder()
+                .orderId(acceptOrderDO.getId())
+                .userId(item.getUserId())
+                .type(item.getType())
+                .groupTeamId(item.getGroupTeamId())
+                .build()).toList();
+        boilerAcceptOrderUserMapper.delete(BoilerAcceptOrderUserDO::getOrderId, acceptOrderDO.getId());
+        boilerAcceptOrderUserMapper.insertBatch(boilerAcceptOrderUserDOS);
     }
 
     @Override
@@ -1797,6 +1815,12 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             }
 
             boilerTaskOrderMapper.updateById(updateObj);
+
+            // 修改受理单约检时间
+            acceptOrderMapper.update(new LambdaUpdateWrapper<AcceptOrderDO>()
+                    .set(AcceptOrderDO::getAppointmentDate, afterObj.getCheckDate())
+                    .eq(AcceptOrderDO::getId,taskOrderDO.getAcceptOrderId())
+            );
         } else if (taskOrderDO.getChangeType() == 200) {
             if (afterObj == null) {
                 return false;
@@ -1981,6 +2005,16 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         if (!acceptOrderUserList.isEmpty()) {
             boilerTaskOrderUserMapper.delete(BoilerTaskOrderUserDO::getOrderId, id);
             boilerTaskOrderUserMapper.insertBatch(acceptOrderUserList);
+            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(finalTaskOrderDO.getAcceptOrderId());
+            // 增加受理单用户
+            List<BoilerAcceptOrderUserDO> boilerAcceptOrderUserDOS = acceptOrderUserList.stream().map(item -> BoilerAcceptOrderUserDO.builder()
+                    .orderId(acceptOrderDO.getId())
+                    .userId(item.getUserId())
+                    .type(item.getType())
+                    .groupTeamId(item.getGroupTeamId())
+                    .build()).toList();
+            boilerAcceptOrderUserMapper.delete(BoilerAcceptOrderUserDO::getOrderId, acceptOrderDO.getId());
+            boilerAcceptOrderUserMapper.insertBatch(boilerAcceptOrderUserDOS);
         }
 
         List<BoilerTaskOrderItemDO> taskOrderItemDOList = boilerTaskOrderItemMapper.selectList(BoilerTaskOrderItemDO::getOrderId, id);

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

@@ -39,6 +39,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.equipboilerschedulingitem.Equ
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderinput.PipeTaskOrderInputDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilerconnectrecordreport.BoilerConnectRecordReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.businessmemberrelation.BusinessMemberRelationMapper;
+import cn.start.tz.module.pressure2.dal.mysql.pipeacceptorderuser.PipeAcceptOrderUserMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderinput.PipeTaskOrderInputMapper;
 import cn.start.tz.module.pressure2.enums.AcceptOrderStatusEnum;
 import cn.start.tz.module.pressure2.enums.RedisKeyEnums;
@@ -255,6 +256,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
     @Resource
     private PipeTaskOrderUserMapper pipeTaskOrderUserMapper;
 
+    @Resource
+    private PipeAcceptOrderUserMapper pipeAcceptOrderUserMapper;
+
     @Resource
     private PipeTaskOrderItemMapper pipeTaskOrderItemMapper;
 
@@ -1026,6 +1030,20 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         //添加新检验员
         pipeTaskOrderUserMapper.insertBatch(acceptOrderList);
 
+
+        PipeTaskOrderDO pipeTaskOrderDO = pipeTaskOrderMapper.selectById(updateReqVO.getId());
+        // 修改受理单检验员
+
+        AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(pipeTaskOrderDO.getAcceptOrderId());
+        // 增加受理单用户
+        List<PipeAcceptOrderUserDO> pipeAcceptOrderUserDOS = acceptOrderList.stream().map(item -> PipeAcceptOrderUserDO.builder()
+                .orderId(acceptOrderDO.getId())
+                .userId(item.getUserId())
+                .type(item.getType())
+                .groupTeamId(item.getGroupTeamId())
+                .build()).toList();
+        pipeAcceptOrderUserMapper.delete(PipeAcceptOrderUserDO::getOrderId, acceptOrderDO.getId());
+        pipeAcceptOrderUserMapper.insertBatch(pipeAcceptOrderUserDOS);
     }
 
     @Override
@@ -1312,7 +1330,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
             // 获取需要生成的数量，默认为 1
             int quantity = vo.getQuantity() != null ? vo.getQuantity() : 1;
-            
+
             // 循环生成指定数量的报告
             for (int i = 0; i < quantity; i++) {
                 PipeTaskOrderItemReportDO addReport = new PipeTaskOrderItemReportDO();
@@ -1324,7 +1342,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
                 // 计算当前是第几个（从 1 开始）
                 int currentIndex = existingTemplateCount + i + 1;
-                
+
                 // 非手动上传
                 if (StringUtils.isBlank(vo.getManualUrl())) {
 
@@ -1340,7 +1358,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                             addReport.setFee(vo.getFee());
                         }
                     }
-                    
+
                     // 添加数量后缀（当数量大于 1 时）
                     if (currentIndex > 1) {
                         addReport.setReportName(baseReportName + currentIndex);
@@ -1377,7 +1395,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     }
                     addReport.setManualUrl(vo.getManualUrl());
                     addReport.setIsManual(true);
-                    
+
                     // 添加数量后缀（当数量大于 1 时）
                     if (currentIndex > 1) {
                         addReport.setReportName(baseReportName + currentIndex);
@@ -1511,6 +1529,12 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 updateObj.setTaskStatus(TaskOrderStatusEnum.CONFIRM.getStatus());
             }
 
+            // 修改受理单约检时间
+            acceptOrderMapper.update(new LambdaUpdateWrapper<AcceptOrderDO>()
+                    .set(AcceptOrderDO::getAppointmentDate, afterObj.getCheckDate())
+                    .eq(AcceptOrderDO::getId,taskOrderDO.getAcceptOrderId())
+            );
+
             pipeTaskOrderMapper.updateById(updateObj);
         } else if (taskOrderDO.getChangeType() == 200) {
             if (afterObj == null) {
@@ -1730,6 +1754,19 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         if (!acceptOrderUserList.isEmpty()) {
             pipeTaskOrderUserMapper.delete(PipeTaskOrderUserDO::getOrderId, id);
             pipeTaskOrderUserMapper.insertBatch(acceptOrderUserList);
+
+            // 修改受理单检验员
+
+            AcceptOrderDO acceptOrderDO = acceptOrderMapper.selectById(finalTaskOrderDO.getAcceptOrderId());
+            // 增加受理单用户
+            List<PipeAcceptOrderUserDO> pipeAcceptOrderUserDOS = acceptOrderUserList.stream().map(item -> PipeAcceptOrderUserDO.builder()
+                    .orderId(acceptOrderDO.getId())
+                    .userId(item.getUserId())
+                    .type(item.getType())
+                    .groupTeamId(item.getGroupTeamId())
+                    .build()).toList();
+            pipeAcceptOrderUserMapper.delete(PipeAcceptOrderUserDO::getOrderId, acceptOrderDO.getId());
+            pipeAcceptOrderUserMapper.insertBatch(pipeAcceptOrderUserDOS);
         }
 
         List<PipeTaskOrderItemDO> taskOrderItemDOList = pipeTaskOrderItemMapper.selectList(PipeTaskOrderItemDO::getOrderId, id);
@@ -4725,7 +4762,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
     @Override
     public Boolean syncAllReportData(BoilerTaskOrderSyncReportVO reqVO) {
-        
+
         PipeTaskOrderItemReportDO itemReportDO = taskOrderItemReportMapper.selectById(reqVO.getRefId());
         if (itemReportDO != null) {
             // 收集需要处理的模板 ID 及其类型列表
@@ -4739,14 +4776,14 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             if (StringUtils.isNotBlank(itemReportDO.getResultTemplateId())) {
                 templateInfos.add(new TemplateInfo(itemReportDO.getResultTemplateId(), 3));
             }
-                    
+
             // 对每个模板 ID 进行循环同步处理
             for (TemplateInfo templateInfo : templateInfos) {
                 DynamicTbDO dynamicTbDO = dynamicTbMapper.selectById(templateInfo.getTemplateId());
                 if (dynamicTbDO == null) {
                     continue;
                 }
-        
+
                 CreateInstantiateWithRuleVO ruleVO = new CreateInstantiateWithRuleVO();
                 ruleVO.setTemplateId(templateInfo.getTemplateId());
                 ruleVO.setRefId(reqVO.getRefId());
@@ -4758,7 +4795,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 reqVO.getParams().put("equipMainType","pipe");
                 reqVO.getParams().put("orderItemId",itemReportDO.getOrderItemId());
                 ruleVO.setParams(reqVO.getParams());
-                        
+
                 //获取 tbCode 的服务方法名
                 BoilerConnectTbServiceDO tbServiceDO = boilerConnectTbServiceMapper.selectOne(BoilerConnectTbServiceDO::getTbId, dynamicTbDO.getId());
                 if (tbServiceDO != null){
@@ -4770,23 +4807,23 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         }
         return false;
     }
-        
+
     /**
      * 模板信息内部类
      */
     private static class TemplateInfo {
         private final String templateId;
         private final int reportType;
-            
+
         public TemplateInfo(String templateId, int reportType) {
             this.templateId = templateId;
             this.reportType = reportType;
         }
-            
+
         public String getTemplateId() {
             return templateId;
         }
-            
+
         public int getReportType() {
             return reportType;
         }