From 4dadc8c3346a2c0e1588d85a6dbb845cafc82d47 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 Apr 2023 11:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=88=97=E8=A1=A8=E6=A0=B9=E6=8D=AE=E6=88=B7=E4=B8=BB?=
 =?UTF-8?q?=E3=80=81=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/CollectListFormDTO.java | 9 +++++++++
 .../src/main/resources/mapper/IcResiCollectDao.xml       | 6 ++++++
 2 files changed, 15 insertions(+)

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 99957503cf..8e0a581428 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
@@ -29,6 +29,15 @@ public class CollectListFormDTO extends PageFormDTO {
      */
     private String domicilePlace;
 
+    /**
+     * 审核状态：0待审核 1审核不通过 2审核通过
+     */
+    private String checkState;
+    /**
+     * 户主姓名
+     */
+    private String houseHolderName;
+
     private String userId;
     private String customerId;
 
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 5a1d341845..ea43232174 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
@@ -56,6 +56,12 @@
         <if test='domicilePlace != null and domicilePlace != "" '>
             AND m.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%')
         </if>
+        <if test='checkState != null and checkState != "" '>
+            AND c.CHECK_STATE = #{checkState}
+        </if>
+        <if test='houseHolderName != null and houseHolderName != "" '>
+            AND c.HOUSE_HOLDER_NAME like concat('%', #{houseHolderName},'%')
+        </if>
         ORDER BY c.CREATED_TIME DESC
     </select>
     <select id="selectMemberList" parameterType="map" resultType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO">