From ad31ae6a8283b45a4b69796dd559e589777c8d10 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 17 Feb 2022 14:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0=E8=AF=AD=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/issue/result/IssueDetailResultDTO.java |  4 ++++
 .../epdc/dto/item/result/ItemDetailResultDTO.java   |  5 +++++
 .../src/main/resources/mapper/issue/IssueDao.xml    | 13 ++++++-------
 .../src/main/resources/mapper/item/ItemDao.xml      | 13 ++++++-------
 4 files changed, 21 insertions(+), 14 deletions(-)

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 @@
         <result property="userLike" column="userLike"/>
         <result property="userDislike" column="userDislike"/>
         <result property="content" column="ISSUE_CONTENT"/>
+        <result property="voice" column="VOICE"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="partyFlag" column="IS_PARTY_MEMBER"/>
         <result property="nickname" column="NICK_NAME"/>
@@ -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'
         <if test='userId != "" and userId != null'>
             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 @@
         <result property="isOperational" column="isOperational"/>
         <result property="isSatisfactionEvaluation" column="isSatisfactionEvaluation"/>
         <result property="isShowSatisfactionEvaluation" column="isShowSatisfactionEvaluation"/>
+        <result property="voice" column="VOICE"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -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'
         <if test='userId != "" and userId != null'>
             LEFT JOIN epdc_event_user_attitude ua ON item.EVENT_ID = ua.EVENT_ID
             AND ua.DEL_FLAG = '0'