From 144922bbd7d76045ffba1b94e3102da6fa940545 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 9 Sep 2022 17:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/item/form/ItemAppealPageDTO.java   | 10 ++++++++++
 .../esua/epdc/dto/item/form/PeopleItemFormDTO.java   | 10 ++++++++++
 .../src/main/resources/mapper/item/ItemDao.xml       | 12 ++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java
index 7ea492752..baa9d2b8a 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAppealPageDTO.java
@@ -24,6 +24,16 @@ public class ItemAppealPageDTO implements Serializable {
 
     private String userId;
 
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 编号
+     */
+    private String serialNum;
+
 //    /**
 //     * 诉求类型 0民生 1发展 2执法
 //     */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java
index 35dfbc1d2..3a68d2451 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/PeopleItemFormDTO.java
@@ -34,6 +34,16 @@ public class PeopleItemFormDTO implements Serializable {
      */
     @NotBlank(message = "诉求分类不可为空")
     private String peopleFlag;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 编号
+     */
+    private String serialNum;
     /**
      * 页码，从1开始
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index e1dbff2c2..144d6098f 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -1404,6 +1404,12 @@
         <if test='peopleFlag != null and peopleFlag != ""'>
             AND t1.PEOPLE_FLAG = #{peopleFlag}
         </if>
+        <if test="mobile != null and mobile != ''">
+            AND t1.MOBILE like concat('%', #{mobile}, '%')
+        </if>
+        <if test="serialNum != null and serialNum != ''">
+            and t1.SERIAL_NUM like '%${serialNum}%'
+        </if>
         ORDER BY
         t1.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
@@ -1570,6 +1576,12 @@
         WHERE
 					item.del_flag='0'
 					and user_id=#{userId}
+                    <if test="mobile != null and mobile != ''">
+                        AND item.MOBILE like concat('%', #{mobile}, '%')
+                    </if>
+                    <if test="serialNum != null and serialNum != ''">
+                        and item.SERIAL_NUM like '%${serialNum}%'
+                    </if>
         ORDER BY
         item.CREATED_TIME DESC,
         img.IMG_URL