议题处理、详情，项目详情添加图片返回

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java

@@ -39,6 +39,10 @@ public class IssueContentDetailDTO implements Serializable {
      * 评论数
      */
     private Integer commentNum;
+    /**
+     * 图片
+     */
+    private List<String> images;
     /**
      * 工作反馈或处理进度
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java

@@ -31,6 +31,10 @@ public class IssueWaitHandleDetailDTO implements Serializable {
      * 议题内容
      */
     private String issueContent;
+    /**
+     * 图片
+     */
+    private List<String> images;
     /**
      * 工作反馈
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java

@@ -47,4 +47,8 @@ public class ItemContentForPCEndResultDTO implements Serializable {
      * 项目处理进度
      */
     private List<ItemHandleProgressResultDTO> handleProgressResultDTOS;
+    /**
+     * 图片
+     */
+    private List<String> images;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -41,6 +41,9 @@
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="issueContent" column="ISSUE_CONTENT"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
         <collection property="jobFeedbackDTOS" ofType="com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO">
             <result property="stateName" column="stateName"/>
             <result property="createdTime" column="CREATED_TIME"/>
@@ -64,32 +67,50 @@
                     '【反馈】'
                     WHEN 2 THEN
                     '【已关闭】' ELSE ''
-                 END) AS stateName
+                 END) AS stateName,
+                 img.IMG_URL
             FROM
                 epdc_issue i
                 LEFT JOIN epdc_issue_handle h ON i.ID = h.ISSUE_ID
                 AND h.DEL_FLAG = '0'
+                LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID
+				AND img.DEL_FLAG = '0'
             WHERE
                 i.DEL_FLAG = '0'
                 AND i.ID = #{id}
-            ORDER BY h.CREATED_TIME DESC
+            ORDER BY h.CREATED_TIME, img.CREATED_TIME DESC
     </select>
 
-    <select id="selectOneIssueContentDetail" resultType="com.elink.esua.epdc.dto.issue.IssueContentDetailDTO">
+    <resultMap id="issueContentDetailMap" type="com.elink.esua.epdc.dto.issue.IssueContentDetailDTO">
+        <result property="nickName" column="NICK_NAME"/>
+        <result property="distributeTime" column="DISTRIBUTE_TIME"/>
+        <result property="issueContent" column="ISSUE_CONTENT"/>
+        <result property="approveNum" column="APPROVE_NUM"/>
+        <result property="opposeNum" column="OPPOSE_NUM"/>
+        <result property="commentNum" column="COMMENT_NUM"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectOneIssueContentDetail" resultMap="issueContentDetailMap">
         SELECT
-            i.NICK_NAME AS nickName,
+            i.NICK_NAME,
-            i.DISTRIBUTE_TIME AS distributeTime,
+            i.DISTRIBUTE_TIME,
-            i.ISSUE_CONTENT AS issueContent,
+            i.ISSUE_CONTENT,
-            e.APPROVE_NUM AS approveNum,
+            e.APPROVE_NUM,
-            e.OPPOSE_NUM AS opposeNum,
+            e.OPPOSE_NUM,
-            e.COMMENT_NUM AS commentNum
+            e.COMMENT_NUM,
+            img.IMG_URL
         FROM
             epdc_issue i
             LEFT JOIN epdc_events e ON i.EVENT_ID = e.ID
             AND e.DEL_FLAG = '0'
+            LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID
+			AND img.DEL_FLAG = '0'
         WHERE
             i.DEL_FLAG = '0'
             AND i.ID = #{issueId}
+        ORDER BY img.CREATED_TIME
     </select>
 
     <select id="selectListOfJobFeedBack" resultType="com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO">

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -329,7 +329,19 @@
             createdTime DESC
     </select>
 
-    <select id="selectItemContentForPCEnd" resultType="com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO">
+    <resultMap id="itemContentForPCEndMap" type="com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO">
+        <result property="id" column="ID"/>
+        <result property="nickName" column="NICK_NAME"/>
+        <result property="distributeTime" column="DISTRIBUTE_TIME"/>
+        <result property="itemContent" column="ITEM_CONTENT"/>
+        <result property="approveNum" column="APPROVE_NUM"/>
+        <result property="opposeNum" column="OPPOSE_NUM"/>
+        <result property="commentNum" column="COMMENT_NUM"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectItemContentForPCEnd" resultMap="itemContentForPCEndMap">
         SELECT
             item.ID,
             item.NICK_NAME,
@@ -337,13 +349,17 @@
             item.ITEM_CONTENT,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
-            eve.COMMENT_NUM
+            eve.COMMENT_NUM,
+            img.IMG_URL
         FROM
             epdc_item item
             LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
             AND eve.DEL_FLAG = '0'
+            LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
+			AND img.DEL_FLAG = '0'
         WHERE
             item.DEL_FLAG = '0'
             AND item.ID = #{itemId}
+        ORDER BY img.CREATED_TIME
     </select>
 </mapper>