diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java index decce16f25..99957503cf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java @@ -24,6 +24,10 @@ public class CollectListFormDTO extends PageFormDTO { */ private String startDate; private String endDate; + /** + * 户籍所在地 + */ + private String domicilePlace; private String userId; private String customerId; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java index 12aff48466..9e30557f72 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -49,6 +49,16 @@ public class IcResiCollectMemFormDTO implements Serializable { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径,包含自己,英文逗号隔开例如:37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java index b93190e5c5..b943676543 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java @@ -58,6 +58,16 @@ public class IcResiMemberEntity extends BaseEpmetEntity { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径,包含自己,英文逗号隔开例如:37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql new file mode 100644 index 0000000000..e10f045969 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql @@ -0,0 +1,2 @@ +alter table ic_resi_member add COLUMN DOMICILE_PLACE_CODE VARCHAR(64) DEFAULT '' comment '户籍所在地行政地区编码' AFTER DOMICILE_PLACE; +alter table ic_resi_member add COLUMN DOMICILE_PLACE_CODE_PATH VARCHAR(255) DEFAULT '' comment '户籍所在地行政地区编码全路径,包含自己,英文逗号隔开例如:37,3702,370203' AFTER DOMICILE_PLACE_CODE; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index ebfe3767fd..9820bdf7d4 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -42,6 +42,10 @@ AND c.id=#{id} + + AND c.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%') + + ORDER BY c.CREATED_TIME DESC