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

@@ -654,8 +654,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         manage.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveOrgCode());
         manage.setReceiveOrgName(jgChangeVehicleRegistrationUnit.getReceiveOrgName());
         manage.setAuditPassDate(new Date());
-        Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
-        manage.setUseUnitAddress(String.valueOf(enterpriseInfo.get("address")));
+        manage.setUseUnitAddress(jgChangeVehicleRegistrationUnit.getAddress());
         // 新增新车牌号后，兼容老数据默认新车牌号 与 老的一致
         manage.setCarNumber(jgChangeVehicleRegistrationUnit.getNewCarNumber() != null ? jgChangeVehicleRegistrationUnit.getNewCarNumber() : jgChangeVehicleRegistrationUnit.getCarNumber());
         manage.setVersion(manage.getVersion() + 1);

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.enums.TcmUnitTypeEnum;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -1042,6 +1044,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                                 .map(value -> value == null ? "" : value)
                                 .collect(Collectors.joining())
                 );
+                // 兼容历史数据，根据产权单位Seq（item.getEstateUnitName()）从tzs_tcm_unit_info表查询产权单位
+                if (!ValidationUtil.isEmpty(item.getEstateUnitName())) {
+                    Map<String, String> propertyUnitInfo = commonService.queryTcmUnitInfoBySeq(item.getEstateUnitName(), TcmUnitTypeEnum.CQ.getCode());
+                    item.setEstateUnitName(MapUtil.getStr(propertyUnitInfo, "sequenceNbr"));
+                }
             });
         }
         return projectContraptionPage;