feat(jg): 更新产权单位信息查询逻辑

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -82,7 +82,27 @@
     </select>
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
         <include refid="page_list"/>
+        ,estate.sequence_nbr AS estateUnitName
         FROM tzs_jg_use_registration_manage tjurm
+        LEFT JOIN (
+        SELECT DISTINCT ON (ri.use_org_code)
+        ri.use_org_code, ei.sequence_nbr
+        FROM idx_biz_jg_register_info ri
+        JOIN idx_biz_jg_use_info ui ON ui.record = ri.record
+        JOIN tzs_tcm_unit_info ei ON ei.unit_code = ui.ESTATE_UNIT_CREDIT_CODE
+        <where>
+            <if test="dto.equListCode != null and dto.equListCode != ''">
+                and ri.EQU_LIST = #{dto.equListCode}
+            </if>
+            <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
+                and ri."EQU_CATEGORY" = #{dto.equCategoryCode}
+            </if>
+            <if test="dto.dataType == 'company' ">
+                AND ui."USE_UNIT_CREDIT_CODE" = #{dto.useUnitCreditCode}
+            </if>
+        </where>
+        ORDER BY ri.use_org_code, ui.rec_date DESC
+        ) estate ON estate.use_org_code = tjurm.use_registration_code
         <where>
             tjurm.is_delete = 0
             <if test="dto.equList != null and dto.equList != ''">
@@ -589,7 +609,7 @@
         ri.use_org_code, ei.sequence_nbr
         FROM idx_biz_jg_register_info ri
         JOIN idx_biz_jg_use_info ui ON ui.record = ri.record
-        JOIN tz_base_enterprise_info ei ON ei.use_unit_code = ui.ESTATE_UNIT_CREDIT_CODE
+        JOIN tzs_tcm_unit_info ei ON ei.unit_code = ui.ESTATE_UNIT_CREDIT_CODE
         <where>
             <if test="dto.equListCode != null and dto.equListCode != ''">
                 and ri.EQU_LIST = #{dto.equListCode}

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

@@ -4499,20 +4499,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     useInfo.setStreetName(useStreetName);
                     useInfo.setAddress(String.valueOf(map.get("address")));
                     useInfo.setIsNotXiXian(String.valueOf(map.get("isXixian")));
-                    useInfo.setEstateUnitCreditCode(Optional.ofNullable(map.get("estateUnitName"))
-                            .map(Object::toString)
-                            .filter(s -> s.contains("_"))
-                            .map(s -> s.split("_", 2))
-                            .filter(parts -> parts.length == 2)
-                            .map(parts -> parts[0])
-                            .orElse(null));
-                    useInfo.setEstateUnitName(Optional.ofNullable(map.get("estateUnitName"))
-                            .map(Object::toString)
-                            .filter(s -> s.contains("_"))
-                            .map(s -> s.split("_", 2))
-                            .filter(parts -> parts.length == 2)
-                            .map(parts -> parts[1])
-                            .orElse(null));
+                    Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(MapUtil.getStr(map, "estateUnitName"), TcmUnitTypeEnum.CQ.getCode());
+                    useInfo.setEstateUnitCreditCode(MapUtil.getStr(propertyUnitInfo, "unitCode"));
+                    useInfo.setEstateUnitName(MapUtil.getStr(propertyUnitInfo, "unitName"));
                     useInfo.setPhone(String.valueOf(map.get("phone")));
                     useInfo.setSafetyManager(map.getString("safetyManagerName"));
                     useInfo.setSafetyManagerId(map.getString("safetyManagerId"));