diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java index e8cec48fb4..66c9828dfd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java @@ -36,11 +36,6 @@ public class IcNatDTO implements Serializable { */ private String isResiUser; - /** - * 是否本辖区居民,1:是;0:否 - */ - private String isLocalResiUser; - /** * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java index 69654aca84..6156c545f9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java @@ -42,6 +42,11 @@ public class IcNatRelationDTO implements Serializable { */ private String icNatId; + /** + * 是否本辖区居民,1:是;0:否 + */ + private String isLocalResiUser; + /** * 关系数据的绑定途径【居民端录入:resi; 数字社区录入:icresi; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java index 93589747e9..7cbe8cdd66 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java @@ -34,11 +34,6 @@ public class IcNatEntity extends BaseEpmetEntity { */ private String isResiUser; - /** - * 是否本辖区居民,1:是;0:否 - */ - private String isLocalResiUser; - /** * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java index 7dd51b4d55..4e48d55d36 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java @@ -41,6 +41,11 @@ public class IcNatRelationEntity extends BaseEpmetEntity { */ private String icNatId; + /** + * 是否本辖区居民,1:是;0:否 + */ + private String isLocalResiUser; + /** * 关系数据的绑定途径【居民端录入:resi; 数字社区录入:icresi; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java index 23387928b5..8fa732459a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java @@ -106,16 +106,7 @@ public class IcNatExcelImportListener implements ReadListener imp IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class); if (StringUtils.isNotBlank(formDTO.getUserId())) { entity.setIsResiUser("1"); - ResiAndLocalResiResultDTO resiCount = icResiUserDao.getResiCount(formDTO.getAgencyId(), formDTO.getIdCard(), formDTO.getCustomerId()); - entity.setIsLocalResiUser(resiCount.getIsLocal() == NumConstant.ZERO ? NumConstant.ZERO_STR : NumConstant.ONE_STR); } insert(entity); //3.核酸记录关系表新增与组织的关系数据 diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql index 9309fde879..ef7236dae3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.78__ic_nat_add_local.sql @@ -1 +1 @@ -alter table ic_nat add COLUMN `IS_LOCAL_RESI_USER` VARCHAR(1) COMMENT '是否本辖区居民,1:是;0:否'after IS_RESI_USER \ No newline at end of file +alter table ic_nat_relation add COLUMN `IS_LOCAL_RESI_USER` VARCHAR(1) COMMENT '是否本辖区居民,1:是;0:否'after IC_NAT_ID \ No newline at end of file