/resi/hall/issue/votinglist返回issueImgs

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;
 }

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;
     }
 
     /**

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,
+            i.ID AS issueId,
-            IFNULL(ISSUE_TITLE,'') AS issueTitle,
+            IFNULL(i.ISSUE_TITLE,'') AS issueTitle,
-            IFNULL(SUGGESTION,'')AS suggestion,
+            IFNULL(i.SUGGESTION,'')AS suggestion,
-            UNIX_TIMESTAMP( created_time ) AS issuePublishTime,
+            UNIX_TIMESTAMP( i.created_time ) AS issuePublishTime,
-            SOURCE_ID                    AS sourceId
+            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'
+            i.DEL_FLAG = '0'
-            AND GRID_ID = #{gridId}
+            AND i.GRID_ID = #{gridId}
-            AND ISSUE_STATUS = 'voting'
+            AND i.ISSUE_STATUS = 'voting'
         ORDER BY
-            created_time DESC
+            i.created_time DESC,ia.SORT asc
     </select>
 
     <!-- 查询已关闭议题列表 -->

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;
+
     /**
      * 话题语音
      */