From b471a0a28d155849d63a98d913a7d3cc98664f42 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 16 Jun 2022 16:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E9=87=87?=
=?UTF-8?q?=E9=9B=86=E4=BF=AE=E6=94=B9=E6=88=B7=E7=B1=8D=E6=89=80=E5=9C=A8?=
=?UTF-8?q?=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/epmet/dto/form/CollectListFormDTO.java | 4 ++++
.../com/epmet/dto/form/IcResiCollectMemFormDTO.java | 10 ++++++++++
.../main/java/com/epmet/entity/IcResiMemberEntity.java | 10 ++++++++++
.../db/migration/V0.0.53__ic_resimember_huji.sql | 2 ++
.../src/main/resources/mapper/IcResiCollectDao.xml | 4 ++++
5 files changed, 30 insertions(+)
create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql
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