IcResiUserSubStatusEnum，新增01，导入02

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IcResiUserSubStatusEnum.java

@@ -0,0 +1,43 @@
+package com.epmet.commons.tools.enums;
+
+/**
+ * 用户详细状态：01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡  未完待续
+ */
+public enum IcResiUserSubStatusEnum {
+    /**
+     * 环境变量枚举
+     */
+    ADD("01", "新增"),
+    IMPORT("02", "导入"),
+    MOVE_IN("03", "迁入"),
+    BIRTH("04", "新生"),
+    MOVE_OUT("11", "迁出"),
+    DIED("21", "死亡");
+
+    private final String subStatus;
+    private final String statusDesc;
+
+
+    IcResiUserSubStatusEnum(String subStatus, String statusDesc) {
+        this.subStatus = subStatus;
+        this.statusDesc = statusDesc;
+    }
+
+    public static IcResiUserSubStatusEnum getEnum(String subStatus) {
+        IcResiUserSubStatusEnum[] values = IcResiUserSubStatusEnum.values();
+        for (IcResiUserSubStatusEnum value : values) {
+            if (value.getSubStatus().equals(subStatus)) {
+                return value;
+            }
+        }
+        return IcResiUserSubStatusEnum.ADD;
+    }
+
+    public String getSubStatus() {
+        return subStatus;
+    }
+
+    public String getStatusDesc() {
+        return statusDesc;
+    }
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -15,6 +15,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -23,7 +24,10 @@ import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
-import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.commons.tools.utils.FileUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcUserChangeDetailedDao;
@@ -451,7 +455,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 // 执行指定的检查以及数据补充
                 execSpecifiedCheckAndFill(columnAndValues);
-
+                //默认新增
+                columnAndValues.put("SUB_STATUS", IcResiUserSubStatusEnum.IMPORT.getSubStatus());
                 String idCard = columnAndValues.get("ID_CARD");
                 Map<String, String> existingResiMap = icResiUserDao.selectResiInfoMap(idCard, null);
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -203,6 +203,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 map.put("customer_id", tokenDto.getCustomerId());
                 map.put("created_by", tokenDto.getUserId());
                 map.put("updated_by", tokenDto.getUserId());
+                //默认新增
+                map.put("SUB_STATUS", IcResiUserSubStatusEnum.ADD.getSubStatus());
                 if (!map.containsKey("AGENCY_ID")) {
                     throw new RenException("新增居民信息--入参AGENCY_ID为空");
                 }