1.压力管道编辑功能接口开发

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/BatchDataChangeProcessStrategy.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
@@ -75,8 +76,7 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg
             this.calTotalPieLineLength(projectContraptionChangeDataDto, items);
             pieLineDataChangeService.update(projectContraptionChangeDataDto, allChangeColumns);
             // 2.使用登记表的装置名称更新
-            jgUseRegistration.setProjectContraption(projectContraptionChangeDataDto.getProjectContraption());
-            useRegistrationService.updateById(jgUseRegistration);
+            updateUseRegisterProjectInfo(jgUseRegistration, projectContraptionChangeDataDto);
             // 设备技术参数入库前校验，约束：同一个装置下的管道编号不能重复
             if (items.size() != items.stream().map(TechParamsPipelineChangeFieldDto::getPipelineNumber).distinct().count()) {
                 throw new BadRequest("同一工程装置下管道编号不能重复！");
@@ -129,6 +129,13 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg
         return allChangeColumns;
     }
 
+    private void updateUseRegisterProjectInfo(JgUseRegistration jgUseRegistration, ProjectContraptionChangeDataDto projectContraptionChangeDataDto) {
+        LambdaUpdateWrapper<JgUseRegistration>  updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(JgUseRegistration::getSequenceNbr, jgUseRegistration.getSequenceNbr());
+        updateWrapper.set(JgUseRegistration::getProjectContraption, projectContraptionChangeDataDto.getProjectContraption());
+        useRegistrationService.update(null, updateWrapper);
+    }
+
     private void calTotalPieLineLength(ProjectContraptionChangeDataDto projectContraptionChangeDataDto, List<PipelineChangeItemDto> items) {
         projectContraptionChangeDataDto.setPipelineLength(items.stream().filter(i -> i.getPipeLength() != null).mapToDouble(TechParamsPipelineChangeFieldDto::getPipeLength).sum());
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/UseRegisterUpdateService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -30,10 +31,13 @@ public class UseRegisterUpdateService {
 
     private final JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
 
-    public UseRegisterUpdateService(IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, JgUseRegistrationServiceImpl useRegistrationService, JgRegistrationHistoryServiceImpl jgRegistrationHistoryService) {
+    private final IdxBizJgProjectContraptionServiceImpl idxBizJgProjectContraptionService;
+
+    public UseRegisterUpdateService(IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, JgUseRegistrationServiceImpl useRegistrationService, JgRegistrationHistoryServiceImpl jgRegistrationHistoryService, IdxBizJgProjectContraptionServiceImpl idxBizJgProjectContraptionService) {
         this.idxBizJgRegisterInfoMapper = idxBizJgRegisterInfoMapper;
         this.useRegistrationService = useRegistrationService;
         this.jgRegistrationHistoryService = jgRegistrationHistoryService;
+        this.idxBizJgProjectContraptionService = idxBizJgProjectContraptionService;
     }
 
     public void updateHisData(String applyNo) {
@@ -82,6 +86,11 @@ public class UseRegisterUpdateService {
                 });
                 jsonObject.put("equipmentLists", result);
             } else {
+                // 管道逻辑 更新装置、管道有关数据
+                IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionService.getById(jgUseRegistration.getProjectContraptionId());
+                jsonObject.put("pipelineLength", projectContraption.getPipelineLength());
+                jsonObject.put("projectContraption",projectContraption.getProjectContraption());
+                jsonObject.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
                 jsonObject.put("equipmentLists", useRegistrationService.getBaseMapper().queryForUnitPipelineEquipment(records));
             }
         }