Merge remote-tracking branch 'origin/develop_tzs_test' into develop_tzs_test

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

@@ -2110,10 +2110,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         Map<String, Map<String, Object>> esUpdateMap = new HashMap<>();
 
         // 4. 更新产权单位信息
-        TzBaseEnterpriseInfo enterpriseInfo = Optional.ofNullable(dto.getEstateUnitSeq())
-                .filter(ObjectUtils::isNotEmpty)
-                .map(tzBaseEnterpriseInfoMapper::selectById)
-                .orElse(null);
+        Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(dto.getEstateUnitSeq(), TcmUnitTypeEnum.CQ.getCode());
         // 提取设备信息（只取第一个）
         if (CollUtil.isNotEmpty(deviceList)) {
             Map<String, Object> first = deviceList.get(0);
@@ -2127,7 +2124,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             records.add(record);
             IdxBizJgUseInfo useInfo = fetchUseInfoByRecord(record);
             if (useInfo != null) {
-                updateUseInfoFields(useInfo, dto, registration, enterpriseInfo);
+                updateUseInfoFields(useInfo, dto, registration, propertyUnitInfo);
                 useInfoMapper.updateById(useInfo);
             }
 
@@ -2194,10 +2191,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
     private void updateUseInfoFields(IdxBizJgUseInfo useInfo, JgChangeRegistrationUnitDto dto, JgChangeRegistrationUnit registration,
-                                     TzBaseEnterpriseInfo enterpriseInfo) {
-        if (enterpriseInfo != null) {
-            useInfo.setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
-                    .setEstateUnitName(enterpriseInfo.getUseUnit());
+                                     Map<String, String> propertyUnitInfo) {
+        if (!ValidationUtil.isEmpty(propertyUnitInfo)) {
+            useInfo.setEstateUnitCreditCode(propertyUnitInfo.get("unitCode"))
+                    .setEstateUnitName(propertyUnitInfo.get("unitName"));
         }
 
         String safetyManager = Optional.ofNullable(registration.getSafetyManager())
@@ -2383,9 +2380,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             String sequenceNbr = (String) map.get(SEQUENCE_NBR);
             projectContraptionIds.add(sequenceNbr);
             String estateUnitSeq = String.valueOf(map.get("estateUnitName"));
-            TzBaseEnterpriseInfo enterpriseInfo = (estateUnitSeq != null && !estateUnitSeq.isEmpty())
-                    ? tzBaseEnterpriseInfoMapper.selectById(estateUnitSeq)
-                    : null;
+            Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(estateUnitSeq, TcmUnitTypeEnum.CQ.getCode());
             LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(IdxBizJgProjectContraption::getUseRegistrationCode, useRegistrationCode)
                     .isNotNull(IdxBizJgProjectContraption::getUseRegistrationCode)
@@ -2395,10 +2390,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 throw new BadRequest("使用登记证编号：" + useRegistrationCode + "对应的工程/装置列表不存在");
             }
             //更新产权信息
-            if (enterpriseInfo != null) {
+            if (!ValidationUtil.isEmpty(propertyUnitInfo)) {
                 idxBizJgUseInfoService.update(
-                        new IdxBizJgUseInfo().setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
-                                .setEstateUnitName(enterpriseInfo.getUseUnit()),
+                        new IdxBizJgUseInfo().setEstateUnitCreditCode(propertyUnitInfo.get("unitCode"))
+                                .setEstateUnitName(propertyUnitInfo.get("unitName")),
                         new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, sequenceNbr)
                 );
             }

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

@@ -30,14 +30,13 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCur
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -122,6 +121,12 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoServiceImpl;
 
     @Autowired
+    private IdxBizJgSupervisionInfoServiceImpl idxBizJgSupervisionInfoService;
+
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+
+    @Autowired
     private EventPublisher eventPublisher;
 
     @Autowired
@@ -515,6 +520,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 //     param.put("SUPERVISORY_CODE", idxBizJgOtherInfo.getSupervisoryCode());
                 // }
             }
+            TzBaseEnterpriseInfo enterpriseInfo = Optional.ofNullable(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode())
+                    .filter(org.apache.commons.lang3.ObjectUtils::isNotEmpty)
+                    .map(tzBaseEnterpriseInfoMapper::selectByUseUnitCode)
+                    .orElse(null);
+            param.put("ADDRESS", ValidationUtil.isEmpty(enterpriseInfo) ? "" : enterpriseInfo.getAddress());
+            param.put("ORG_BRANCH_CODE", jgChangeVehicleRegistrationUnit.getOrgBranchCode());
+            param.put("ORG_BRANCH_NAME", jgChangeVehicleRegistrationUnit.getOrgBranchName());
             objMap.put(item, param);
         });
         tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
@@ -597,13 +609,14 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             updateEsData(collect, jgChangeVehicleRegistrationUnit, code);
         }
 
+        // 更新使用信息
+        LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
+        lambda.in(IdxBizJgUseInfo::getRecord, collect);
+        IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
         // 产权单位信息
         if (!StringUtils.isEmpty(jsonObject.getString("estateUnitName"))) {
             String[] data = String.valueOf(jsonObject.getString("estateUnitName")).split("_");
             // 更新产权单位
-            LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
-            lambda.in(IdxBizJgUseInfo::getRecord, collect);
-            IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
             if (data.length > 1) {
                 useInfo.setEstateUnitCreditCode(data[0]);
                 useInfo.setEstateUnitName(data[1]);
@@ -611,8 +624,18 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 useInfo.setEstateUnitName(MapUtil.getStr(jsonObject, "estateUnitName"));
                 useInfo.setEstateUnitCreditCode(MapUtil.getStr(jsonObject, "estateUnitCreditCode"));
             }
-            idxBizJgUseInfoServiceImpl.update(useInfo, lambda);
         }
+        useInfo.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
+        useInfo.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
+        idxBizJgUseInfoServiceImpl.update(useInfo, lambda);
+
+        // 更新监管信息
+        IdxBizJgSupervisionInfo supervisionInfo = idxBizJgSupervisionInfoService.lambdaQuery().
+                eq(IdxBizJgSupervisionInfo::getRecord, collect).
+                one();
+        supervisionInfo.setOrgBranchName(jgChangeVehicleRegistrationUnit.getOrgBranchName());
+        supervisionInfo.setOrgBranchCode(jgChangeVehicleRegistrationUnit.getOrgBranchCode());
+        idxBizJgSupervisionInfoService.saveOrUpdate(supervisionInfo);
 
         // 区内变更
         if ("1".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {