fix(jg): 兼容历史数据中的 estateUnitName 字段处理

- 引入 MapUtil 工具类以支持从映射中安全获取字符串值 - 在处理 registrationList 时增加对历史数据的兼容逻辑 - 当 estateUnitSeq 为空且 estateUnitName 非空时，查询并替换 estateUnitName 的值 - 使用 commonServiceImpl 查询 tcmUnitInfo 并更新 estateUnitName 为正确的单位主键用以前端回显

fix(jg): 兼容历史数据中的 estateUnitName 字段处理
820360c2 · tianbo · a136cefd · 820360c2
Commit 820360c2 authored Dec 01, 2025 by tianbo
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 1 deletion

JgChangeRegistrationUnitServiceImpl.java ...biz/service/impl/JgChangeRegistrationUnitServiceImpl.java +15 -1

No files found.
--- a/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
+++ b/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
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;

 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -274,7 +275,20 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                changeInfo.put("safetyManagerName", notice.getSafetyManager().split("_")[1]);
            }
        } else {
-            changeInfo.put("registrationList", JSON.parse(historyServiceOne.getChangeData()));
+            JSONArray registrationList = JSON.parseArray(historyServiceOne.getChangeData());
+            if (!ValidationUtil.isEmpty(registrationList)) {
+                registrationList.stream().map(obj -> (JSONObject) obj).forEach(jsonObject -> {
+                    String estateUnitSeq = jsonObject.getString("estateUnitSeq");
+                    String estateUnitName = jsonObject.getString("estateUnitName");
+                    // 兼容历史数据（历史数据estateUnitName字段存的是base_info表主键）
+                    // 如果estateUnitSeq字段存在则表示是新加的单子不用特殊处理
+                    if (ValidationUtil.isEmpty(estateUnitSeq) && !ValidationUtil.isEmpty(estateUnitName)) {
+                        Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(estateUnitName, TcmUnitTypeEnum.CQ.getCode());
+                        jsonObject.put("estateUnitName", MapUtil.getStr(propertyUnitInfo, "sequenceNbr"));
+                    }
+                });
+            }
+            changeInfo.put("registrationList", registrationList);
        }
        changeInfo.put("havingPermission", notice.getNextExecuteUserIds() != null && notice.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
        String companyType = selectedOrgInfo.getCompany().getCompanyType();