From 7d9b15185b5675c0dc4e4464f8048a319b3f8458 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Sep 2022 14:31:44 +0800
Subject: [PATCH] =?UTF-8?q?/resi/hall/issue/closedlist=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/ClosedIssueListResultDTO.java  | 12 ++++++
 .../epmet/service/impl/IssueServiceImpl.java  |  3 +-
 .../src/main/resources/mapper/IssueDao.xml    | 41 +++++++++++++------
 .../com/epmet/controller/IssueController.java |  5 +--
 .../epmet/service/impl/IssueServiceImpl.java  |  2 +-
 5 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java
index 08bfdca9e6..68b2b4367e 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.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,15 @@ public class ClosedIssueListResultDTO 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 30054255d2..4761577b1c 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
@@ -620,7 +620,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Override
     public List<ClosedIssueListResultDTO> closedList(CommonIssueListFormDTO issueListForm) {
         PageHelper.startPage(issueListForm.getPageNo(), issueListForm.getPageSize(), issueListForm.getIsPage());
-        return baseDao.selectClosedList(issueListForm);
+        List<ClosedIssueListResultDTO> resultDTOList=baseDao.selectClosedList(issueListForm);
+        return resultDTOList;
     }
 
     /**
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 acd64f9758..a1e3a4acd1 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
@@ -226,7 +226,7 @@
         FROM
             issue i
         left join  issue_attachment  ia
-        on(i.id=ia.BUSINESS_ID)
+        on(i.id=ia.BUSINESS_ID and ia.del_flag='0')
         WHERE
             i.DEL_FLAG = '0'
             AND i.GRID_ID = #{gridId}
@@ -235,23 +235,38 @@
             i.created_time DESC,ia.SORT asc
     </select>
 
+    <resultMap id="ClosedIssueListResultDTOMap" type="com.epmet.dto.result.ClosedIssueListResultDTO">
+        <id column="issueId" property="issueId" />
+        <result column="issueTitle" property="issueTitle"/>
+        <result column="solution" property="solution"/>
+        <result column="issueClosedTime" property="issueClosedTime"/>
+        <result column="sourceId" property="sourceId"/>
+        <result column="SOURCE_TYPE" property="sourceType"/>
+        <collection property="issueImgs" ofType="java.lang.String">
+            <result column="url"/>
+        </collection>
+    </resultMap>
     <!-- 查询已关闭议题列表 -->
-    <select id="selectClosedList" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.ClosedIssueListResultDTO">
+    <select id="selectClosedList" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultMap="ClosedIssueListResultDTOMap">
         SELECT
-            ID AS issueId,
-            IFNULL(ISSUE_TITLE,'') AS issueTitle,
-            IFNULL(CLOSE_REASON,'') AS solution,
-            UNIX_TIMESTAMP( created_time ) AS issueClosedTime,
-            SOURCE_ID AS sourceId
+            i.ID AS issueId,
+            IFNULL(i.ISSUE_TITLE,'') AS issueTitle,
+            IFNULL(i.CLOSE_REASON,'') AS solution,
+            UNIX_TIMESTAMP( i.created_time ) AS issueClosedTime,
+            i.SOURCE_ID AS sourceId,
+            i.SOURCE_TYPE,
+            ia.URL
         FROM
-            issue
+            issue i
+        left join issue_attachment ia
+        on(i.id=ia.BUSINESS_ID and ia.del_flag='0')
         WHERE
-            DEL_FLAG = '0'
-            AND GRID_ID = #{gridId}
-            AND ISSUE_STATUS = 'closed'
-            AND RESOLVE_TYPE = 'resolved'
+            i.DEL_FLAG = '0'
+            AND i.GRID_ID = #{gridId}
+            AND i.ISSUE_STATUS = 'closed'
+            AND i.RESOLVE_TYPE = 'resolved'
         ORDER BY
-            created_time DESC
+            i.created_time DESC,ia.sort asc
     </select>
     <!-- 查询已关闭议题列表 政府端 -->
     <select id="selectClosedListGov" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.ClosedIssueListGovResultDTO">
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
index e3c06ede7a..5ce5c0ddd8 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
@@ -28,9 +28,6 @@ public class IssueController {
     @Autowired
     private IssueService issueService;
 
-    @Autowired
-    private GovIssueFeignClient govIssueFeignClient;
-
     /**
      * @Description  议题详情
      * @param issueDetail
@@ -198,7 +195,7 @@ public class IssueController {
     }
 
     /**
-     * @Description 获取关闭议题列表
+     * @Description 获取关闭议题列表 居民端-议事-已处理-已关闭
      * @param issueListFormDTO
      * @return Result<List<ClosedIssueListResultDTO>>
      * @author wangc
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index fabcb5939e..9ec7f08bcc 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -511,7 +511,7 @@ public class IssueServiceImpl implements IssueService {
     }
 
     /**
-     * 已结案项目列表
+     * 居民端议事-已处理-已结案项目列表 （就是议题转项目并且已解决的）
      *
      * @param formDTO
      * @return java.util.List<com.epmet.dto.result.ResolvedResultDTO>