From cfedf63f1253c3991210d48db33c016198452661 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 12 Sep 2019 14:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/controller/ApiIssueController.java    | 2 +-
 .../java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java | 4 ++++
 .../java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java   | 4 ++++
 .../src/main/resources/mapper/issue/IssueDao.xml              | 3 +++
 .../src/main/resources/mapper/item/ItemDao.xml                | 3 +++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java
index 283e2baa5..8cc2f8990 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java
@@ -63,7 +63,7 @@ public class ApiIssueController {
      * @Date: 2019/9/7 12:08
      */
     @GetMapping("list")
-    public Result<List<IssueResultDTO>> listIssues(@LoginUser TokenDto userDetail, IssueFormDTO formDto) {
+    public Result<List<IssueResultDTO>> listIssues(@LoginUser TokenDto userDetail, @RequestBody IssueFormDTO formDto) {
         return issueService.listIssues(userDetail, formDto);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java
index b748c9fc8..70186501e 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java
@@ -49,4 +49,8 @@ public class IssueFormDTO implements Serializable {
      * 只查询半年内的数据
      */
     private Date someMonthsAgo;
+    /**
+     * 议题分类ID
+     */
+    private String categoryId;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java
index 16528165a..d28e9df99 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java
@@ -43,4 +43,8 @@ public class ItemFormDTO implements Serializable {
      * 只查询半年内的数据
      */
     private Date someMonthsAgo;
+    /**
+     * 议题分类ID
+     */
+    private String categoryId;
 }
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 e5fbf16ab..862d72566 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
@@ -192,6 +192,9 @@
         <if test='searchContent != null and searchContent != ""'>
             AND issue.ISSUE_CONTENT LIKE CONCAT('%',#{searchContent},'%')
         </if>
+        <if test='categoryId != null and categoryId != ""'>
+            AND issue.ISSUE_CATEGORY_ID = #{categoryId}
+        </if>
         ORDER BY
         <if test='orderType == "1"'>statementNum DESC,</if>
         issue.DISTRIBUTE_TIME DESC,
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 c247e246f..5a2726df6 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
@@ -82,6 +82,9 @@
         <if test='searchContent != null and searchContent != ""'>
             AND item.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%')
         </if>
+        <if test='categoryId != null and categoryId != ""'>
+            AND item.ISSUE_CATEGORY_ID = #{categoryId}
+        </if>
         ORDER BY
         item.CREATED_TIME DESC,
         img.CREATED_TIME