【pc端- 议题管理 】-【筛选条件增加】-（魏凯）-2020/06/16

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))

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>