From a8e09f7cbbcadbc323f0e29ba2cd7d059e2ade58 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 10 Oct 2022 09:36:44 +0800
Subject: [PATCH] ai

---
 .../src/main/resources/mapper/IssueDao.xml    | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
index c802a6244a..06f323277a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -876,18 +876,22 @@
     <!-- 查询所有议题 -->
     <select id="allIssueList" resultType="com.epmet.dto.result.AllIssueListResultDTO">
         SELECT
-            ID AS issueId,
-            ISSUE_STATUS,
-            SOURCE_TYPE,
-            (CASE WHEN ISSUE_STATUS = 'shift_project' THEN '已转项目'
-                  WHEN ISSUE_STATUS = 'voting' THEN '表决中'
-                  WHEN ISSUE_STATUS = 'closed' THEN '已关闭'
+            i.ID AS issueId,
+            i.ISSUE_STATUS,
+            i.SOURCE_TYPE,
+            (CASE WHEN i.ISSUE_STATUS = 'shift_project' THEN '已转项目'
+                  WHEN i.ISSUE_STATUS = 'voting' THEN '表决中'
+                  WHEN i.ISSUE_STATUS = 'closed' THEN '已关闭'
                   ELSE '已关闭' END) AS issueStatusName,
-            ISSUE_TITLE,
-            GRID_ID,
-            ORG_ID,
-            CREATED_TIME
-        FROM issue
+            i.ISSUE_TITLE,
+            i.GRID_ID,
+            i.ORG_ID,
+            i.CREATED_TIME,
+            i.suggestion,
+            vs.support_count,
+            vs.OPPOSITION_COUNT
+        FROM issue i
+        LEFT JOIN issue_vote_statistical vs ON vs.ISSUE_ID = i.ID AND vs.DEL_FLAG = '0'
         WHERE DEL_FLAG = '0'
         <if test='null != startTime and startTime != "" '>
             AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') >= #{startTime}