From 96065a076081af65d73e96e1f75249714e4f2f2d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Sep 2022 14:03:52 +0800
Subject: [PATCH] =?UTF-8?q?/resi/hall/issue/votinglist=E8=BF=94=E5=9B=9Eis?=
 =?UTF-8?q?sueImgs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/VotingIssueListResultDTO.java  | 11 ++++++
 .../epmet/service/impl/IssueServiceImpl.java  |  3 +-
 .../src/main/resources/mapper/IssueDao.xml    | 37 +++++++++++++------
 .../dto/result/VotingIssueListResultDTO.java  | 10 +++++
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
index 2ac18595ea..6725684610 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description 政府端/居民段查看表决中议题列表返参
@@ -38,4 +39,14 @@ public class VotingIssueListResultDTO implements Serializable {
      * 来源话题的id
      */
     private String sourceId;
+
+    /**
+     * 来源类型 话题：resi_topic；直接立议题：issue；
+     */
+    private String sourceType;
+
+    /**
+     * 发布议题的图片
+     */
+    private List<String> issueImgs;
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 8722a0c027..30054255d2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -606,7 +606,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Override
     public List<VotingIssueListResultDTO> votingList(CommonIssueListFormDTO issueListForm) {
         PageHelper.startPage(issueListForm.getPageNo(), issueListForm.getPageSize(), issueListForm.getIsPage());
-        return baseDao.selectVotingList(issueListForm);
+        List<VotingIssueListResultDTO> resultList=baseDao.selectVotingList(issueListForm);
+        return resultList;
     }
 
     /**
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 4dbcbb2e9a..acd64f9758 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
@@ -202,22 +202,37 @@
         </trim>
     </insert>
 
+    <resultMap id="VotingIssueListResultDTOMap" type="com.epmet.dto.result.VotingIssueListResultDTO">
+        <id column="issueId" property="issueId" />
+        <result column="issueTitle" property="issueTitle"/>
+        <result column="suggestion" property="suggestion"/>
+        <result column="issuePublishTime" property="issuePublishTime"/>
+        <result column="sourceId" property="sourceId"/>
+        <result column="sourceType" property="sourceType"/>
+        <collection property="issueImgs" ofType="java.lang.String">
+            <result column="url"/>
+        </collection>
+    </resultMap>
     <!-- 查询表决中议题列表 -->
-    <select id="selectVotingList" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.VotingIssueListResultDTO">
+    <select id="selectVotingList" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultMap="VotingIssueListResultDTOMap">
         SELECT
-            ID AS issueId,
-            IFNULL(ISSUE_TITLE,'') AS issueTitle,
-            IFNULL(SUGGESTION,'')AS suggestion,
-            UNIX_TIMESTAMP( created_time ) AS issuePublishTime,
-            SOURCE_ID                    AS sourceId
+            i.ID AS issueId,
+            IFNULL(i.ISSUE_TITLE,'') AS issueTitle,
+            IFNULL(i.SUGGESTION,'')AS suggestion,
+            UNIX_TIMESTAMP( i.created_time ) AS issuePublishTime,
+            i.SOURCE_ID                    AS sourceId,
+            i.SOURCE_TYPE as sourceType,
+            ia.url
         FROM
-            issue
+            issue i
+        left join  issue_attachment  ia
+        on(i.id=ia.BUSINESS_ID)
         WHERE
-            DEL_FLAG = '0'
-            AND GRID_ID = #{gridId}
-            AND ISSUE_STATUS = 'voting'
+            i.DEL_FLAG = '0'
+            AND i.GRID_ID = #{gridId}
+            AND i.ISSUE_STATUS = 'voting'
         ORDER BY
-            created_time DESC
+            i.created_time DESC,ia.SORT asc
     </select>
 
     <!-- 查询已关闭议题列表 -->
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
index 3b9bee2505..4209446f79 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
@@ -40,11 +40,21 @@ public class VotingIssueListResultDTO implements Serializable {
      */
     private String sourceId;
 
+    /**
+     * 来源类型 话题：resi_topic；直接立议题：issue；
+     */
+    private String sourceType;
+
     /**
      * 话题图片列表
      */
     private List<String> topicImgs;
 
+    /**
+     * 发布议题的图片
+     */
+    private List<String> issueImgs;
+
     /**
      * 话题语音
      */