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 { + /** + * 根据服务记录id,查询反馈记录 + * @param serviceRecordId + * @return + */ IcServiceFeedbackResDTO selectByRecId(@Param("serviceRecordId") String serviceRecordId); - List getAttachmentList(String serviceProjectId); + /** + * 根据服务反馈id,查询附件列表 + * @param feedBackId + * @return + */ + List 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 @@ - - + @@ -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}