From c9455b80e23f98796a3890624cd103062533068a Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Fri, 29 Jul 2022 16:11:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=91=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E8=80=81=E5=B9=B4=E4=BA=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BA=86=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=B8=AD(=E4=B9=8B=E5=89=8D=E6=BC=8F=E6=8E=89=E8=BF=99?=
 =?UTF-8?q?=E7=A7=8D=E6=83=85=E5=86=B5=E4=BA=86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcResiUserImportServiceImpl.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index ffeaea8246..7f8921443f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -548,6 +548,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     if ((transferData = this.getResiImportTrasferData(existingResiMap, columnAndValues)) != null) {
                         newlyOrChangedResi.get().getTransferedResis().put(existingResiMap.get("ID"), transferData);
                     }
+
+                    // 因为主表会产生变更记录的，只有组织变更；其他能产生变更记录的，都在子表里面，所以此处只判断组织变更，其他类别的变更交给子表
+                    // 老年人产生变更记录，只会在新增居民的时候产生，修改居民信息不会产生，因为身份证不可变
                 } else {
                     // 新增居民
                     String resiId = IdWorker.getIdStr();
@@ -566,6 +569,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                             columnAndValues.get("HOME_ID"),
                             new HashMap<>());
 
+                    // 因为老年人会通过年龄计算，子sheet中不一定有这个人的信息，所以此处需要加入到变更记录中去
+                    if ("1".equals(columnAndValues.get("IS_OLD_PEOPLE"))) {
+                        categoryData.getCategories().put("IS_OLD_PEOPLE", "1");
+                    }
+
                     redisUtils.hMSet(RedisKeys.icResiImportResiCategoryKey(newlyOrChangedResi.get().getImportTag(), "add", resiId), BeanUtil.beanToMap(categoryData));
                     categoryData = null;
                 }