fix(大编辑)：bug修复

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/changeRegistrationReform/ChangeRegistrationReformEditUpdateService.java

@@ -101,7 +101,7 @@ public class ChangeRegistrationReformEditUpdateService {
                 // 按照装置id查询装置下管道，更新为已纳管状态
                 List<IdxBizJgUseInfo> useInfos = commonEquipDataProcessService.getIdxBizJgUseInfoService().list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, jgChangeRegistrationReform.getProjectContraptionId()).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getRecord));
                 useInfos.parallelStream().forEach(e -> {
-                    commonEquipDataProcessService.setNewPipeline2IntoManage(e);
+                    commonEquipDataProcessService.setNewPipeline2InUseState(e);
                     commonEquipDataProcessService.updateUseOrgCode2NewPipeline(e, jgChangeRegistrationReform.getUseRegistrationCode());
                 });
             }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/newProject/NewProjectEditUpdateService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.newProject;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgUseInfoServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
@@ -30,9 +31,9 @@ public class NewProjectEditUpdateService {
     public void updateBizInfo(String projectContraptionId) {
         IdxBizJgProjectContraption projectContraption = commonEquipDataProcessService.getIdxBizJgProjectContraptionServiceImpl().getOne(new LambdaQueryWrapper<IdxBizJgProjectContraption>().eq(BaseEntity::getSequenceNbr, projectContraptionId).select(BaseEntity::getSequenceNbr, IdxBizJgProjectContraption::getUseRegistrationCode));
         // 按照装置id查询装置下管道，更新为已纳管状态写入使用登记证编号
-        List<IdxBizJgUseInfo> useInfos = useInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(IdxBizJgUseInfo::getRecord));
+        List<IdxBizJgUseInfo> useInfos = useInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(IdxBizJgUseInfo::getRecord, TzsBaseEntity::getSequenceNbr));
         useInfos.parallelStream().forEach(e -> {
-            commonEquipDataProcessService.setNewPipeline2IntoManage(e);
+            commonEquipDataProcessService.setNewPipeline2InUseState(e);
             commonEquipDataProcessService.updateUseOrgCode2NewPipeline(e, projectContraption.getUseRegistrationCode());
         });
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterUpdateService.java

@@ -26,8 +26,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -90,7 +88,7 @@ public class UseRegisterUpdateService {
                 // 按照装置id查询装置下管道，更新为已纳管状态
                 List<IdxBizJgUseInfo> useInfos = jgUseRegistrationService.getIdxBizJgUseInfoService().list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, useRegistration.getProjectContraptionId()).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getRecord));
                 useInfos.parallelStream().forEach(e -> {
-                    commonEquipDataProcessService.setNewPipeline2IntoManage(e);
+                    commonEquipDataProcessService.setNewPipeline2InUseState(e);
                     commonEquipDataProcessService.updateUseOrgCode2NewPipeline(e, useRegistration.getUseRegistrationCode());
                 });
             }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -19,6 +19,8 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.IdxBizJgPipelineOperationHist;
@@ -134,6 +136,8 @@ public class CommonEquipDataProcessService {
 
     private final IdxBizJgRegisterInfoServiceImpl jgRegisterInfoService;
 
+    private final ESEquipmentCategory esEquipmentCategory;
+
     public static final String BASE_COLUMN_REC_DATE = "\"REC_DATE\"";
     public static final String BASE_COLUMN_REC_USERID = "\"REC_USER_ID\"";
 
@@ -1123,11 +1127,20 @@ public class CommonEquipDataProcessService {
                 .collect(Collectors.toList());
     }
 
-    public void setNewPipeline2IntoManage(IdxBizJgUseInfo useInfo) {
+    public void setNewPipeline2InUseState(IdxBizJgUseInfo useInfo) {
+        // es 更新为已纳管
         LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(TzsBaseEntity::getSequenceNbr, useInfo.getSequenceNbr());
         updateWrapper.set(IdxBizJgUseInfo::getIsIntoManagement, true);
         jgUseRegistrationService.getIdxBizJgUseInfoService().update(updateWrapper);
+        // es 更新为已纳管、在用
+        Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(useInfo.getRecord());
+        if (optional.isPresent()) {
+            ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
+            esEquipmentCategoryDto.setIS_INTO_MANAGEMENT(true);
+            esEquipmentCategoryDto.setEQU_STATE(EquimentEnum.ZAIYONG.getCode());
+            esEquipmentCategory.save(esEquipmentCategoryDto);
+        }
     }
 
     public void updateUseOrgCode2NewPipeline(IdxBizJgUseInfo e, String useOrgCode) {