fix(jg):证管理表更新设备地址问题处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/constant/ChangeFieldWatchConstants.java

@@ -65,12 +65,12 @@ public class ChangeFieldWatchConstants {
 
     static {
         Map<String, Set<String>> map = new LinkedHashMap<>();
-        map.put("USE_CERT", USE_CERT_MONITORED_FIELDS);
         map.put("USE_FLAG", USE_FLAG_MONITORED_FIELDS);
         map.put("USE_FLAG_VEHICLE", USE_FLAG_VEHICLE_MONITORED_FIELDS);
         map.put("PIPELINE_SUMMARY", PIPELINE_SUMMARY_TABLE_MONITORED_FIELDS);
         map.put("USE_CYLINDER_SUMMARY", USE_CYLINDER_SUMMARY_TABLE_MONITORED_FIELDS);
         map.put("NOTICE", NOTICE_MONITORED_FIELDS);
+        map.put("USE_CERT", USE_CERT_MONITORED_FIELDS);
         FIELD_MAP = Collections.unmodifiableMap(map);
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/event/listener/ChangeEquipImpactCertListener.java

@@ -232,8 +232,15 @@ public class ChangeEquipImpactCertListener {
 
     private void handleDefaultRegistration(BaseBizDataChangeEvent event) {
         if (event.getBizRelationData().getBizIsFinished()){
+                String equId = Stream.concat(
+                        Optional.ofNullable(event.getBizRelationData().getProjectContraptionIds()).orElse(Collections.emptySet()).stream(),
+                        Optional.ofNullable(event.getBizRelationData().getRecords()).orElse(Collections.emptySet()).stream()
+                ).findFirst().orElse(null);
+                LambdaQueryWrapper<IdxBizJgRegisterInfo> queryRegisterWrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
+                queryRegisterWrapper.eq(IdxBizJgRegisterInfo::getRecord, equId);
+                IdxBizJgRegisterInfo registerInfo = registerInfoMapper.selectOne(queryRegisterWrapper);
             JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
-                    .eq(JgUseRegistrationManage::getApplyNo, event.getBizRelationData().getBizId())
+                    .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
                     .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .one();
             this.handleFieldChange(event.getData(), jgUseRegistrationManage);

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

@@ -315,6 +315,9 @@ public class EquipChangeDataUpdateServiceImpl {
             esEquipmentCategoryDto.setUSE_UNIT_CREDIT_CODE(equipUseInfoChangeDataDto.getUseUnitCreditCode());
             esEquipmentCategoryDto.setUSC_UNIT_NAME(equipUseInfoChangeDataDto.getUseUnitName());
             esEquipmentCategoryDto.setUSE_INNER_CODE(equipUseInfoChangeDataDto.getUseInnerCode());
+            esEquipmentCategoryDto.setUSE_PLACE(equipUseInfoChangeDataDto.getProvinceName() + "/" + equipUseInfoChangeDataDto.getCityName() + "/" + equipUseInfoChangeDataDto.getCountyName() + "/" + equipUseInfoChangeDataDto.getStreetName());
+            esEquipmentCategoryDto.setUSE_PLACE_CODE(equipUseInfoChangeDataDto.getProvince() + "#" + equipUseInfoChangeDataDto.getCity() + "#" + equipUseInfoChangeDataDto.getCounty() + "#" + equipUseInfoChangeDataDto.getFactoryUseSiteStreet());
+            esEquipmentCategoryDto.setADDRESS(equipUseInfoChangeDataDto.getAddress());
             esEquipmentCategory.save(esEquipmentCategoryDto);
         }
     }