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; }