From 9f3f9b12714b7e295f66a565ae0fdd497eb30c47 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Jun 2022 15:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/IcServiceFeedbackResDTO.java    |  4 ++--
 .../java/com/epmet/dao/IcServiceFeedbackDao.java     | 12 +++++++++++-
 .../main/resources/mapper/IcServiceFeedbackDao.xml   | 10 +++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/IcServiceFeedbackResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/IcServiceFeedbackResDTO.java
index c5fa0c3cbf..394b5b6b40 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/IcServiceFeedbackResDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/IcServiceFeedbackResDTO.java
@@ -12,9 +12,9 @@ import java.util.List;
 public class IcServiceFeedbackResDTO implements Serializable {
 
     /**
-     * 服务项目ID
+     * 反馈记录id
      */
-    private String serviceProjectId;
+    private String feedBackId;
 
     /**
      * 服务目标
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceFeedbackDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceFeedbackDao.java
index 4e0e660571..301a261fb1 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceFeedbackDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceFeedbackDao.java
@@ -17,7 +17,17 @@ import java.util.List;
 @Mapper
 public interface IcServiceFeedbackDao extends BaseDao<IcServiceFeedbackEntity> {
 
+    /**
+     * 根据服务记录id,查询反馈记录
+     * @param serviceRecordId
+     * @return
+     */
     IcServiceFeedbackResDTO selectByRecId(@Param("serviceRecordId") String serviceRecordId);
 
-    List<IcServiceFeedbackResDTO.Attachment> getAttachmentList(String serviceProjectId);
+    /**
+     * 根据服务反馈id,查询附件列表
+     * @param feedBackId
+     * @return
+     */
+    List<IcServiceFeedbackResDTO.Attachment> getAttachmentList(String feedBackId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackDao.xml
index 6592e2d11c..2f58637231 100755
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackDao.xml
@@ -31,8 +31,8 @@
         <result property="longitude" column="LONGITUDE"/>
         <result property="latitude" column="LATITUDE"/>
         <result property="address" column="address"/>
-        <result property="serviceProjectId" column="SERVICE_PROJECT_ID"/>
-        <collection property="attachmentList" column="SERVICE_PROJECT_ID"
+        <result property="feedBackId" column="feedBackId"/>
+        <collection property="attachmentList" column="feedBackId"
                     ofType="com.epmet.dto.result.IcServiceFeedbackResDTO$Attachment"
                     select="com.epmet.dao.IcServiceFeedbackDao.getAttachmentList">
             <result property="attachmentName" column="ATTACHMENT_NAME"/>
@@ -50,12 +50,12 @@
             f.LATITUDE,
             f.LONGITUDE,
             f.address,
-            f.SERVICE_PROJECT_ID
+            f.id as feedBackId
         FROM
             ic_service_feedback f
         WHERE
             f.DEL_FLAG = '0'
-            and f.SERVICE_RECORD_ID=#{serviceRecordId}
+            and f.SERVICE_RECORD_ID = #{serviceRecordId}
     </select>
 
     <select id="getAttachmentList" parameterType="java.lang.String" resultType="com.epmet.dto.result.IcServiceFeedbackResDTO$Attachment">
@@ -68,7 +68,7 @@
             ic_service_project_attachment t
         WHERE
             t.DEL_FLAG = '0'
-            AND t.IC_SERVICE_ID = #{serviceProjectId}
+            AND t.IC_SERVICE_ID = #{feedBackId}
         ORDER BY
             t.SORT ASC
     </select>