From 1b3bb9400071a8fd7cd12c4c85f9fffce3d1645e Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Mon, 6 Jan 2020 17:29:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=AE=E9=A2=98=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=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/dto/issue/form/IssueFormDTO.java | 9 +++++++--
 .../esua/epdc/dto/issue/result/IssueDetailResultDTO.java | 5 +++++
 .../com/elink/esua/epdc/dto/item/form/ItemFormDTO.java   | 9 +++++++--
 .../esua/epdc/dto/item/result/ItemDetailResultDTO.java   | 5 +++++
 .../src/main/resources/mapper/issue/IssueDao.xml         | 9 +++++++--
 .../src/main/resources/mapper/item/ItemDao.xml           | 9 +++++++--
 .../dto/topic/form/TopicListFormDTO.java                 | 5 +++++
 .../src/main/resources/mapper/topic/TopicDao.xml         | 3 +++
 8 files changed, 46 insertions(+), 8 deletions(-)

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 4c4712461..7fd5346c1 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
@@ -50,7 +50,12 @@ public class IssueFormDTO implements Serializable {
      */
     private Date someMonthsAgo;
     /**
-     * 议题分类ID
+     * 议题一级分类ID
      */
-    private String categoryCode;
+    private String firstCategoryCode;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java
index e0b74d83d..a1ce07cf4 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java
@@ -79,4 +79,9 @@ public class IssueDetailResultDTO implements Serializable {
      * 议事图片
      */
     private List<String> images;
+
+    /**
+     * 一级分类编码
+     */
+    private String firstCategoryCode;
 }
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 f1215f65e..c87fae02e 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
@@ -45,9 +45,9 @@ public class ItemFormDTO implements Serializable {
      */
     private Date someMonthsAgo;
     /**
-     * 议题分类ID
+     * 议题一级分类ID
      */
-    private String categoryCode;
+    private String firstCategoryCode;
     /**
      * 用户ID
      */
@@ -62,4 +62,9 @@ public class ItemFormDTO implements Serializable {
      */
     @NotNull(message = "项目状态不能为空")
     private Integer itemState;
+
+    /**
+     * 项目ID
+     */
+    private String itemId;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
index 8c4196c82..541da97d0 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
@@ -125,4 +125,9 @@ public class ItemDetailResultDTO implements Serializable {
      * 议事图片
      */
     private List<String> images;
+
+    /**
+     * 一级分类编码
+     */
+    private String firstCategoryCode;
 }
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 75a81d9bc..978341da9 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
@@ -209,8 +209,11 @@
                 <if test='searchContent != null and searchContent != ""'>
                     AND t1.ISSUE_CONTENT LIKE CONCAT('%',#{searchContent},'%')
                 </if>
-                <if test='categoryCode != null and categoryCode != ""'>
-                    AND t1.category_code = #{categoryCode}
+                <if test='firstCategoryCode != null and firstCategoryCode != ""'>
+                    AND t1.FIRST_CATEGORY_CODE = #{firstCategoryCode}
+                </if>
+                <if test='issueId != null and issueId != ""'>
+                    AND t1.ID = #{issueId}
                 </if>
                 ORDER BY
                 <if test='orderType == "1"'>( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC,</if>
@@ -239,6 +242,7 @@
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
         <result property="categoryCode" column="CATEGORY_CODE"/>
+        <result property="firstCategoryCode" column="FIRST_CATEGORY_CODE"/>
         <result property="isOperational" column="isOperational"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
@@ -259,6 +263,7 @@
             issue.USER_FACE,
             issue.ISSUE_ADDRESS,
             issue.CATEGORY_CODE,
+            issue.FIRST_CATEGORY_CODE,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
             eve.BROWSE_NUM,
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 dae950e38..7d0ebc25f 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
@@ -92,12 +92,15 @@
                 <if test='formDto.searchContent != null and formDto.searchContent != ""'>
                     AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
                 </if>
-                <if test='formDto.categoryCode != null and formDto.categoryCode != ""'>
-                    AND t1.CATEGORY_CODE = #{formDto.categoryCode}
+                <if test='formDto.firstCategoryCode != null and formDto.firstCategoryCode != ""'>
+                    AND t1.FIRST_CATEGORY_CODE = #{formDto.firstCategoryCode}
                 </if>
                 <if test='formDto.userId != null and formDto.userId != ""'>
                     AND t1.USER_ID = #{formDto.userId}
                 </if>
+                <if test='formDto.itemId != null and formDto.itemId != ""'>
+                    AND t1.ID = #{formDto.itemId}
+                </if>
                 ORDER BY
                 <if test='formDto.orderType != null and formDto.orderType != "" and formDto.orderType == "1"'>
                     t1.LAST_HANDLE_TIME DESC
@@ -278,6 +281,7 @@
         <result property="commentNum" column="COMMENT_NUM"/>
         <result property="statementNum" column="statementNum"/>
         <result property="categoryCode" column="CATEGORY_CODE"/>
+        <result property="firstCategoryCode" column="FIRST_CATEGORY_CODE"/>
         <result property="isOperational" column="isOperational"/>
         <result property="isSatisfactionEvaluation" column="isSatisfactionEvaluation"/>
         <result property="isShowSatisfactionEvaluation" column="isShowSatisfactionEvaluation"/>
@@ -302,6 +306,7 @@
             item.USER_FACE,
             item.ISSUE_ADDRESS,
             item.CATEGORY_CODE,
+            item.FIRST_CATEGORY_CODE,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
             eve.BROWSE_NUM,
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java
index 85e9ca29c..5fe1afb43 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java
@@ -53,4 +53,9 @@ public class TopicListFormDTO implements Serializable {
      */
     private String currentUserId;
 
+    /**
+     * 话题ID
+     */
+    private String topicId;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
index 813f84bd3..2735e5a69 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -167,6 +167,9 @@
             <if test="timestamp != null and timestamp.trim() != ''">
                 <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
             </if>
+            <if test="topicId != null and topicId.trim() != ''">
+                AND t1.ID = #{topicId}
+            </if>
             <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{someMonthsAgo}
         </if>
         ORDER BY