From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

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 77b4d4f..b6d7a28 100644
--- a/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml
+++ b/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml
@@ -43,10 +43,24 @@
         <result column="tname" property="tname"/>
     </resultMap>
 
-
+    <!--自定义分页列表-->
     <select id="selectFeedbackPage" resultMap="feedbackResultMap">
-        select * from sys_feedback where is_deleted = 0
+        select * from sys_feedback
+        where 1=1
+        <if test="feedback.status==1">
+            and jid is null
+        </if>
+        <if test="feedback.sname!=null and 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}
+        </if>
+        <if test="feedback.endTime!=null and feedback.endTime!='' and feedback.endTime!='undefined'">
+            and stime&lt;=#{feedback.endTime}
+        </if>
     </select>
+
 
     <insert id="insertfeed">
        INSERT INTO act_deploy (jid,snumber,sname,addvcd,place,result,describe,type,devicenumber,galarmpeople,phone,stime,
@@ -73,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>

--
Gitblit v1.9.3