diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java index a1ce07cf4..5205a355f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java @@ -27,6 +27,10 @@ public class IssueDetailResultDTO implements Serializable { * 议题内容 */ private String content; + /** + * 语音 + */ + private String voice; /** * 创建时间 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java index 073c37085..8ab5e6e21 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java @@ -37,6 +37,11 @@ public class ItemDetailResultDTO implements Serializable { */ private String content; + /** + * 语音 + */ + private String voice; + /** * 电话 */ 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 c23a06f15..fbfaf91b2 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 @@ -270,6 +270,7 @@ + @@ -294,6 +295,7 @@ issue.ID, issue.EVENT_ID, issue.ISSUE_CONTENT, + iii.IMG_URL as VOICE, issue.DISTRIBUTE_TIME, issue.IS_PARTY_MEMBER, issue.NICK_NAME, @@ -310,13 +312,10 @@ true ELSE false END AS isOperational, img.IMG_URL - FROM - epdc_issue issue - LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID - AND img.DEL_FLAG = '0' - AND img.IMG_TYPE = 'events' - LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID - AND eve.DEL_FLAG = '0' + FROM epdc_issue issue + LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'events' + LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' + LEFT JOIN epdc_img iii ON issue.EVENT_ID = iii.REFERENCE_ID AND iii.DEL_FLAG = '0' AND iii.IMG_TYPE = 'eventsVoice' LEFT JOIN epdc_event_user_attitude ua ON issue.EVENT_ID = ua.EVENT_ID AND ua.DEL_FLAG = '0' diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index abe568c1c..455e78c2e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -369,6 +369,7 @@ + @@ -385,6 +386,7 @@ item.EVENT_ID, item.ISSUE_ID, item.ITEM_CONTENT, + iii.IMG_URL as VOICE, item.ITEM_STATE, item.CREATED_TIME, item.IS_PARTY_MEMBER, @@ -411,13 +413,10 @@ true ELSE false END AS isShowSatisfactionEvaluation, img.IMG_URL - FROM - epdc_item item - LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID - AND img.DEL_FLAG = '0' - AND img.IMG_TYPE = 'events' - LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID - AND eve.DEL_FLAG = '0' + FROM epdc_item item + LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'events' + LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' + LEFT JOIN epdc_img iii ON item.EVENT_ID = iii.REFERENCE_ID AND iii.DEL_FLAG = '0' AND iii.IMG_TYPE = 'eventsVoice' LEFT JOIN epdc_event_user_attitude ua ON item.EVENT_ID = ua.EVENT_ID AND ua.DEL_FLAG = '0'