From 4a8d15a61c0e87810b7772f46c7807492a892d5e Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Fri, 3 Jul 2020 17:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=BE=A4=E4=B8=8E=E8=AD=A6?=
 =?UTF-8?q?=E6=B0=91=E7=BE=A4=E8=AF=9D=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../topic/controller/TopicController.java     | 34 +++++++++++++++++++
 .../mapper/smile/topic/GroupTopicDao.xml      |  4 +--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/controller/TopicController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/controller/TopicController.java
index f19f805..fdc6f29 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/controller/TopicController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/controller/TopicController.java
@@ -54,6 +54,14 @@ public class TopicController {
     @Autowired
     private TopicService topicService;
 
+    /**
+     * PC端 - 物业群话题管理 - 列表分页
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.smile.dto.topic.TopicDTO>>
+     * @author
+     * @date 2020/7/3 17:31
+     */
     @GetMapping("page")
     @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public Result<PageData<TopicDTO>> page(@RequestParam Map<String, Object> params) {
@@ -61,6 +69,14 @@ public class TopicController {
         return new Result<PageData<TopicDTO>>().ok(page);
     }
 
+    /**
+     * PC端 - 警民群话题管理 - 列表分页
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.smile.dto.topic.TopicDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/7/3 17:32
+     */
     @GetMapping("policepage")
     @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public Result<PageData<TopicDTO>> policePage(@RequestParam Map<String, Object> params) {
@@ -98,6 +114,15 @@ public class TopicController {
         return new Result();
     }
 
+    /**
+     * PC端 - 物业群话题管理 - 导出
+     *
+     * @param params
+     * @param response
+     * @return void
+     * @author
+     * @date 2020/7/3 17:33
+     */
     @GetMapping("export")
     @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
@@ -105,6 +130,15 @@ public class TopicController {
         ExcelUtils.exportExcelToTarget(response, null, list, TopicExcel.class);
     }
 
+    /**
+     * PC端 - 警民群话题管理 - 导出
+     *
+     * @param params
+     * @param response
+     * @return void
+     * @author
+     * @date 2020/7/3 17:33
+     */
     @GetMapping("policeexport")
     @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public void exportPolice(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml
index 63823a6..fbb883c 100644
--- a/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml
@@ -200,7 +200,7 @@
         WHERE
             temp.DEL_FLAG = '0'
             AND temp.STATE IN ( 0, 5, 20)
-            AND temp.GROUP_CATEGORY = 'property_group'
+            AND temp.CATEGORY_CODE = 'property_group'
         <if test="associatedType != null and associatedType != ''">
             AND temp.STATE in (0,5,10,15)
         </if>
@@ -252,7 +252,7 @@
         WHERE
         temp.DEL_FLAG = '0'
         AND temp.STATE IN ( 0, 5, 20)
-        AND temp.GROUP_CATEGORY = 'police_group'
+        AND temp.CATEGORY_CODE = 'police_group'
         <if test="associatedType != null and associatedType != ''">
             AND temp.STATE in (0,5,10,15)
         </if>