diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java index b84985206..2cd99c51d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java +++ b/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 images; /** * 工作反馈或处理进度 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java index 760daf9ff..cfbf08d7e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java +++ b/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 images; /** * 工作反馈 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java index 8baa04907..a77c98fc7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java +++ b/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 handleProgressResultDTOS; + /** + * 图片 + */ + private List images; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 2833e3a13..b48a209a5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -41,6 +41,9 @@ + + + @@ -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 - i.NICK_NAME AS nickName, - i.DISTRIBUTE_TIME AS distributeTime, - i.ISSUE_CONTENT AS issueContent, - e.APPROVE_NUM AS approveNum, - e.OPPOSE_NUM AS opposeNum, - e.COMMENT_NUM AS commentNum + i.NICK_NAME, + i.DISTRIBUTE_TIME, + i.ISSUE_CONTENT, + e.APPROVE_NUM, + e.OPPOSE_NUM, + 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 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