From 9a8d3f7ad2717fd6089e43fb5de9dc4815877d9b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 23 Jun 2021 14:04:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.java b/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.java
index b3f15d4..46cba06 100644
--- a/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.java
+++ b/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.java
@@ -18,6 +18,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.feedback.entity.Feedback;
 import org.springblade.modules.feedback.vo.FeedbackVO;
 
@@ -39,10 +40,17 @@
 	 * @param feedback
 	 * @return
 	 */
-	List<FeedbackVO> selectFeedbackPage(IPage page, FeedbackVO feedback);
+	List<FeedbackVO> selectFeedbackPage(IPage page, @Param("feedback") FeedbackVO feedback);
 	List<FeedbackVO> selectFeedList();
 	List<FeedbackVO> selectFeedEdit(String jid);
 	List<Map<String, Object>> selectWjEdit(String jid);
 	void insertfeed(String jid, String snumber, String sname, String addvcd, String place, String result, String describe, String type, String devicenumber, String galarmpeople, String phone, String stime,
 					String ctime, String feedbackaudio, String feedbackvideo, String feedbackphoto, String jd, String wd, String tname);
+
+	/**
+	 * 根据 上报Id 获取上报的基本信息
+	 * @param id 上报Id
+	 * @return
+	 */
+	Feedback getFeedbackById(Integer id);
 }

--
Gitblit v1.9.3