From 0ca3815ee97b2ac261c9996619f391ef3c62aa7b Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Tue, 16 Jun 2020 17:45:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-=20=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E3=80=91-=E3=80=90=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E9=AD=8F=E5=87=AF=EF=BC=89-2020/06/16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/events/EpdcEventsDao.xml   | 12 ++++++++++++
 .../src/main/resources/mapper/issue/IssueDao.xml     |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index a6ac97454..a9c0fc330 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -69,6 +69,12 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
+        <if test="eventContent != null and eventContent != ''">
+            AND  temp.event_content like '%${eventContent}%'
+        </if>
+        <if test="nickName != null and nickName != '' ">
+            AND temp.nick_Name like '%${nickName}%'
+        </if>
         <if test="gridId != null and gridId != ''">
             AND (temp.GRID_ID = #{gridId}
             OR find_in_set(#{gridId},temp.ALL_DEPT_IDS))
@@ -103,6 +109,12 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </if>
+        <if test="eventContent !=null and eventContent!=''">
+            and temp.EVENT_CONTENT like '%${eventContent}%'
+        </if>
+        <if test="nickName !=null and nickName!=''">
+            and temp.NICK_NAME like '%${nickName}%'
+        </if>
         <if test="gridId != null and gridId != ''">
             AND (temp.GRID_ID = #{gridId}
             OR find_in_set(#{gridId},temp.ALL_DEPT_IDS))
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index b13373de1..a148f43c8 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -62,6 +62,12 @@
         <if test="itemState !=null and itemState!=''">
             and ei.ITEM_STATE=#{itemState}
         </if>
+        <if test="issueContent !=null and issueContent!=''">
+            and issue.ISSUE_CONTENT like '%${issueContent}%'
+        </if>
+        <if test="nickName !=null and nickName!=''">
+            and e.NICK_NAME like '%${nickName}%'
+        </if>
         ORDER BY
         issue.CREATED_TIME DESC
     </select>