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.xml             |    8 +++++++-
 src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java         |    7 +++++++
 src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java |   10 ++++++++++
 src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.java            |   10 +++++++++-
 src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java    |    2 +-
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java b/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
index ae1059b..e16fa5d 100644
--- a/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
+++ b/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
@@ -90,7 +90,7 @@
 		}
 		wj.setSid(feedback.getId());
 		//查询基本信息
-		map.put("feedback",feedbackService.getOne(Condition.getQueryWrapper(feedback)));
+		map.put("feedback",feedbackService.getFeedbackById(feedback.getId()));
 		//获取图片
 		wj.setType(1);
 		map.put("images",iWjService.selectResouces(wj));
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);
 }
diff --git a/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml b/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml
index 4e6c8f7..b6d7a28 100644
--- a/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml
+++ b/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml
@@ -51,7 +51,7 @@
             and jid is null
         </if>
         <if test="feedback.sname!=null and feedback.sname!=''">
-            and sname like concat('%',#{feedback.sname},'%'))
+            and sname like concat('%',#{feedback.sname},'%')
         </if>
         <if test="feedback.beginTime!=null and feedback.beginTime!='' and feedback.beginTime!='undefined'">
             and stime&gt;=#{feedback.beginTime}
@@ -87,4 +87,10 @@
         FROM
             sys_wj WHERE jid=#{jid}
     </select>
+
+
+    <!--根据 上报Id 获取上报的基本信息-->
+    <select id="getFeedbackById" resultType="org.springblade.modules.feedback.entity.Feedback">
+        select id,snumber,sname,place,result,stime from sys_feedback where id = #{id}
+    </select>
 </mapper>
diff --git a/src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java b/src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java
index 572bbbe..ceb1eec 100644
--- a/src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java
+++ b/src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java
@@ -47,4 +47,11 @@
 	List<Map<String, Object>> selectWjEdit(String jid);
 
     Integer insert(FeedbackVO feedback);
+
+	/**
+	 * 根据 上报Id 获取上报的基本信息
+	 * @param id 上报Id
+	 * @return
+	 */
+	Feedback getFeedbackById(Integer id);
 }
diff --git a/src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java b/src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java
index cfc7bca..94fee13 100644
--- a/src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java
+++ b/src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java
@@ -66,4 +66,14 @@
 		baseMapper.insert(feedback);
 		return feedback.getId();
 	}
+
+	/**
+	 * 根据 上报Id 获取上报的基本信息
+	 * @param id 上报Id
+	 * @return
+	 */
+	@Override
+	public Feedback getFeedbackById(Integer id) {
+		return baseMapper.getFeedbackById(id);
+	}
 }

--
Gitblit v1.9.3