fix(大编辑)：bug修复

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/ProjectContraptionChangeDataDto.java

@@ -125,4 +125,10 @@ public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
     @FieldDisplayDefine(value = "投用日期", isExist = false)
     private String useDate;
 
+    @FieldDisplayDefine(value = "属地监管部门", isRepeatColumn = true)
+    private String orgCode;
+
+    @FieldDisplayDefine(value = "属地监管部门")
+    private String orgName;
+
 }

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.setNewPipeline2InUseState(e);
+                    commonEquipDataProcessService.setNewPipeline2InUseState(e, jgChangeRegistrationReform.getUseRegistrationCode());
                     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

@@ -33,7 +33,7 @@ public class NewProjectEditUpdateService {
         // 按照装置id查询装置下管道，更新为已纳管状态写入使用登记证编号
         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.setNewPipeline2InUseState(e);
+            commonEquipDataProcessService.setNewPipeline2InUseState(e, projectContraption.getUseRegistrationCode());
             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

@@ -88,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.setNewPipeline2InUseState(e);
+                    commonEquipDataProcessService.setNewPipeline2InUseState(e, useRegistration.getUseRegistrationCode());
                     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

@@ -1127,18 +1127,19 @@ public class CommonEquipDataProcessService {
                 .collect(Collectors.toList());
     }
 
-    public void setNewPipeline2InUseState(IdxBizJgUseInfo useInfo) {
+    public void setNewPipeline2InUseState(IdxBizJgUseInfo useInfo, String useOrgCode) {
         // es 更新为已纳管
         LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(TzsBaseEntity::getSequenceNbr, useInfo.getSequenceNbr());
         updateWrapper.set(IdxBizJgUseInfo::getIsIntoManagement, true);
         jgUseRegistrationService.getIdxBizJgUseInfoService().update(updateWrapper);
-        // es 更新为已纳管、在用
+        // 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());
+            esEquipmentCategoryDto.setUSE_ORG_CODE(useOrgCode);
             esEquipmentCategory.save(esEquipmentCategoryDto);
         }
     }

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

@@ -92,6 +92,8 @@ public class PieLineDataChangeServiceImpl {
         updateWrapper.set(IdxBizJgProjectContraption::getProjectContraptionNo, projectContraptionChangeDataDtoNew.getProjectContraptionNo());
         updateWrapper.set(IdxBizJgProjectContraption::getProductPhoto, projectContraptionChangeDataDtoNew.getProductPhoto());
         updateWrapper.set(IdxBizJgProjectContraption::getOtherAccessories, projectContraptionChangeDataDtoNew.getOtherAccessories());
+        updateWrapper.set(IdxBizJgProjectContraption::getOrgCode, projectContraptionChangeDataDtoNew.getOrgCode());
+        updateWrapper.set(IdxBizJgProjectContraption::getOrgName, projectContraptionChangeDataDtoNew.getOrgName());
         updateWrapper.set(IdxBizJgProjectContraption::getProductQualificationCertificate, projectContraptionChangeDataDtoNew.getProductQualificationCertificate());
         updateWrapper.set(BaseEntity::getRecDate, new Date());
         updateWrapper.eq(BaseEntity::getSequenceNbr, projectContraptionChangeDataDtoNew.getProjectContraptionId());

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

@@ -8,6 +8,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.biz.edit.constant.EditConstant;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
@@ -268,6 +269,11 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
                 }
             });
         }
+        // 属地监管部门设置
+        if (StringUtils.isNotEmpty(projectContraptionChangeDataDto.getOrgCode())) {
+            CompanyBo companyBo = commonEquipDataProcessService.getCommonMapper().queryCompanyByOrgCode(projectContraptionChangeDataDto.getOrgCode());
+            projectContraptionChangeDataDto.setOrgName(companyBo.getCompanyName());
+        }
     }