压力管道-公用、长输管道告知页面调整

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/JgInstallationNoticeServiceImpl.java

@@ -353,7 +353,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         List<JgInstallationNoticeEq> jgInstallationNoticeEqs = jgInstallationNoticeEqMapper.selectList(lambda);
         if (!ValidationUtil.isEmpty(jgInstallationNoticeEqs)) {
             // 压力管道从工程装置表查询设备信息
-            if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategory)) {
+            if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategory) || PipelineEnum.LONG_DISTANCE_PIPELINE.getCode().equals(equCategory) || PipelineEnum.COMMON_PIPELINE.getCode().equals(equCategory)) {
                 String projectContraptionId = (String) installationInfo.get("projectContraptionId");
                 IdxBizJgProjectContraption projectContraption = projectContraptionService.getById(projectContraptionId);
                 installationInfo.put("pipelineLength", projectContraption.getPipelineLength());
@@ -1258,7 +1258,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     String finalYm = ym;
                     // 工程装置id
                     String projectContraptionId = jgInstallationNotice.getProjectContraptionId();
-                    if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(jgInstallationNotice.getEquCategoryCode())) {
+                    String equCategoryCode = jgInstallationNotice.getEquCategoryCode();
+                    if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)|| PipelineEnum.LONG_DISTANCE_PIPELINE.getCode().equals(equCategoryCode) || PipelineEnum.COMMON_PIPELINE.getCode().equals(equCategoryCode)) {
                         // 处理工业管道审批后业务数据保存
                         this.savePipelineData(jgInstallationNotice, jgRelationEquips, finalYm, dto, taskV2Model1);
                         jgResumeInfoService.saveBatchResume(
@@ -1583,7 +1584,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         String equCategoryCode = jgInstallationNotice.getEquCategoryCode();
         Map<String, Object> installationInfo = BeanUtil.beanToMap(jgInstallationNotice, false, true);
         // 压力管道从工程装置表查询设备信息
-        if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)) {
+        if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)|| PipelineEnum.LONG_DISTANCE_PIPELINE.getCode().equals(equCategoryCode) || PipelineEnum.COMMON_PIPELINE.getCode().equals(equCategoryCode)) {
             String projectContraptionId = jgInstallationNotice.getProjectContraptionId();
             IdxBizJgProjectContraption projectContraption = projectContraptionService.getById(projectContraptionId);
             if (!ValidationUtil.isEmpty(projectContraption)) {
@@ -1752,8 +1753,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     private void deleteConstructionInfo(JgInstallationNotice installationNotice) {
         constructionInfoMapper.delete(new LambdaQueryWrapper<IdxBizJgConstructionInfo>().eq(IdxBizJgConstructionInfo::getNoticeId, installationNotice.getSequenceNbr()));
+        String equCategoryCode = installationNotice.getEquCategoryCode();
         // 如果设备类型是工业管道，则还需删除工程装置施工信息
-        if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(installationNotice.getEquCategoryCode())) {
+        if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)|| PipelineEnum.LONG_DISTANCE_PIPELINE.getCode().equals(equCategoryCode) || PipelineEnum.COMMON_PIPELINE.getCode().equals(equCategoryCode)) {
             LambdaQueryWrapper<IdxBizJgProjectConstruction> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(IdxBizJgProjectConstruction::getNoticeId, installationNotice.getSequenceNbr());
             projectConstructionMapper.delete(queryWrapper);
@@ -1781,7 +1783,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             this.rollBackEsInfo(jgRelationEquip, idxBizJgRegisterInfo);
         });
         // 如果是工业管道，则回滚工程装置表信息
-        if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(installationNotice.getEquCategoryCode())) {
+        String equCategoryCode = installationNotice.getEquCategoryCode();
+        if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)|| PipelineEnum.LONG_DISTANCE_PIPELINE.getCode().equals(equCategoryCode) || PipelineEnum.COMMON_PIPELINE.getCode().equals(equCategoryCode)) {
             this.rollBackProjectContraptionInfo(installationNotice);
         }
         //删除设备履历信息