From c7b0737836cb0d0c702106795e3b35f0171deac2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 20:43:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=82=B9=E4=BA=BA?= =?UTF-8?q?=E7=BE=A4=E3=80=81=E5=9B=BD=E7=B1=8D=E3=80=81=E4=BA=BA=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E6=95=B4=E6=B2=BB=E9=9D=A2=E8=B2=8C?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcResiUserDTO.java | 25 +++++++++++++++++++ .../com/epmet/entity/IcResiUserEntity.java | 24 ++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index bf93b3b225..d16310d77c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -105,6 +105,11 @@ public class IcResiUserDTO implements Serializable { */ private String idCard; + /** + * 证件类型。烟台需求：来源于字典表dict_type=yt_id_card_type;1：身份证号；2：护照；3：港澳通行证；4：军人证；5：台胞证；6：其他 + */ + private String idCardType; + /** * 出生日期 */ @@ -125,6 +130,26 @@ public class IcResiUserDTO implements Serializable { */ private String contactsMobile; + /** + * 烟台需求：重点人群；名称对应字典表，dict_type:yt_key_point_user_type + */ + private String keyPointUserType; + + /** + * 烟台需求：国籍 + */ + private String nationality; + + /** + * 烟台需求：人口类型；名称对应字典表，dict_type:yt_population_type + */ + private String populationType; + + /** + * 烟台需求：政治面貌；名称对应字典表，dict_type:yt_politics_status + */ + private String politicsStatus; + /** * 九小场所url */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index a78fae885d..eda20ac933 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -102,7 +102,7 @@ public class IcResiUserEntity extends BaseEpmetEntity { private String idCard; /** - * 证件类型。1：身份证号；2：护照 + * 证件类型。烟台需求：来源于字典表dict_type=yt_id_card_type;1：身份证号；2：护照；3：港澳通行证；4：军人证；5：台胞证；6：其他 */ private String idCardType; @@ -126,7 +126,27 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String contactsMobile; - /** + /** + * 烟台需求：重点人群；名称对应字典表，dict_type:yt_key_point_user_type + */ + private String keyPointUserType; + + /** + * 烟台需求：国籍 + */ + private String nationality; + + /** + * 烟台需求：人口类型；名称对应字典表，dict_type:yt_population_type + */ + private String populationType; + + /** + * 烟台需求：政治面貌；名称对应字典表，dict_type:yt_politics_status + */ + private String politicsStatus; + + /** * 九小场所url */ private String ninePlace; From 6e771a6d2db0211d300adde4001173f8acd71f5c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 21:15:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=EF=BC=9A=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3=E7=B3=BB=EF=BC=88?= =?UTF-8?q?60=EF=BC=89=E5=AF=B9=E5=BA=94=E5=AD=97=E5=85=B8=E8=A1=A8dict=5F?= =?UTF-8?q?type:yt=5FHouseholder=5Frelationship=5Ftype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcResiUserDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/IcResiUserEntity.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index d16310d77c..3098207e44 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -490,6 +490,11 @@ public class IcResiUserDTO implements Serializable { */ private String jtxxRemakes; + /** + * 烟台需求：与户主关系（60）对应字典表dict_type:yt_Householder_relationship_type + */ + private String yt_yhzgx; + /** * 用户状态【0:正常;1:迁出;2:注销】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index eda20ac933..33037d487c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -480,6 +480,11 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String jtxxRemakes; + /** + * 烟台需求：与户主关系（60）对应字典表dict_type:yt_Householder_relationship_type + */ + private String yt_yhzgx; + /** * 用户状态【0:正常;1:迁出;2:注销】 */ From 00de29ab2806b8e45ea4dac7385c5add38bb7267 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 09:17:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=88=B7=E7=B1=8D=E6=89=80=E5=9C=A8?= =?UTF-8?q?=E5=9C=B0=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A=EF=BC=8C?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=B5=AA=E6=BD=AE=E9=82=A3=E7=9A=84=E6=88=B7?= =?UTF-8?q?=E7=B1=8D=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcResiUserDTO.java | 4 ++-- .../src/main/java/com/epmet/entity/IcResiUserEntity.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index 3098207e44..31a6740e6b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -426,9 +426,9 @@ public class IcResiUserDTO implements Serializable { private String jg; /** - * 户籍所在地 + * 户籍所在地;烟台需求：对应户籍详细地址 */ - private String hjszd; + private String hjszd; /** * 现居住地 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index 33037d487c..427d18a897 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -415,9 +415,9 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String jg; - /** - * 户籍所在地 - */ + /** + * 户籍所在地;烟台需求：对应户籍详细地址 + */ private String hjszd; /** From c4dd042be2033c924a1d6d8f67544863f2a395fa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 09:19:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AFic=5Fre?= =?UTF-8?q?si=5Fuser=E5=A2=9E=E5=8A=A0=E6=88=B7=E7=B1=8D=E3=80=81=E5=B1=85?= =?UTF-8?q?=E4=BD=8F=E7=AD=8921=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcResiUserDTO.java | 105 ++++++++++++++++++ .../com/epmet/entity/IcResiUserEntity.java | 105 ++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index 31a6740e6b..62541c7469 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -440,6 +440,111 @@ public class IcResiUserDTO implements Serializable { */ private String rhzk; + /** + * 烟台需求：是否现居住；0否；1是，对应字典表dict_type: + */ + private String isNowLive; + + /** + * 烟台需求：居住省 + */ + private String livingProvince; + + /** + * 烟台需求：居住市 + */ + private String livingCity; + + /** + * 烟台需求：居住区 + */ + private String livingArea; + + /** + * 烟台需求：居住街道 + */ + private String livingStreet; + + /** + * 烟台需求：居住社区 + */ + private String livingCommunity; + + /** + * 烟台需求：居住小区 + */ + private String livingViliageName; + + /** + * 烟台需求：居住楼号 + */ + private String livingBuildingNo; + + /** + * 烟台需求：居住单元号 + */ + private String livingUnitNo; + + /** + * 烟台需求：居住房间号 + */ + private String livingHouseNo; + + /** + * 烟台需求：户籍所在省 + */ + private String registerProvince; + + /** + * 烟台需求：户籍所在市 + */ + private String registerCity; + + /** + * 烟台需求：户籍所在区县 + */ + private String registerArea; + + /** + * 烟台需求：户籍所在街道 + */ + private String registerStreet; + + /** + * 烟台需求：户籍所在社区 + */ + private String registerCommunity; + + /** + * 烟台需求：户籍所在小区名称 + */ + private String registerViliageName; + + /** + * 烟台需求：户籍楼号 + */ + private String registerBuildingNo; + + /** + * 烟台需求：户籍单元号 + */ + private String registerUnitNo; + + /** + * 烟台需求：户籍房间号 + */ + private String registerHouseNo; + + /** + * 烟台需求：户别；对应字典表dict_type:yt_household_category + */ + private String householdCategory; + + /** + * 烟台需求：户号 + */ + private String houseHoldId; + /** * 居住信息备注 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index 427d18a897..961f69dfe9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -430,6 +430,111 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String rhzk; + /** + * 烟台需求：是否现居住；0否；1是，对应字典表dict_type: + */ + private String isNowLive; + + /** + * 烟台需求：居住省 + */ + private String livingProvince; + + /** + * 烟台需求：居住市 + */ + private String livingCity; + + /** + * 烟台需求：居住区 + */ + private String livingArea; + + /** + * 烟台需求：居住街道 + */ + private String livingStreet; + + /** + * 烟台需求：居住社区 + */ + private String livingCommunity; + + /** + * 烟台需求：居住小区 + */ + private String livingViliageName; + + /** + * 烟台需求：居住楼号 + */ + private String livingBuildingNo; + + /** + * 烟台需求：居住单元号 + */ + private String livingUnitNo; + + /** + * 烟台需求：居住房间号 + */ + private String livingHouseNo; + + /** + * 烟台需求：户籍所在省 + */ + private String registerProvince; + + /** + * 烟台需求：户籍所在市 + */ + private String registerCity; + + /** + * 烟台需求：户籍所在区县 + */ + private String registerArea; + + /** + * 烟台需求：户籍所在街道 + */ + private String registerStreet; + + /** + * 烟台需求：户籍所在社区 + */ + private String registerCommunity; + + /** + * 烟台需求：户籍所在小区名称 + */ + private String registerViliageName; + + /** + * 烟台需求：户籍楼号 + */ + private String registerBuildingNo; + + /** + * 烟台需求：户籍单元号 + */ + private String registerUnitNo; + + /** + * 烟台需求：户籍房间号 + */ + private String registerHouseNo; + + /** + * 烟台需求：户别；对应字典表dict_type:yt_household_category + */ + private String householdCategory; + + /** + * 烟台需求：户号 + */ + private String houseHoldId; + /** * 居住信息备注 */