From 456d96aecc44d7e7d88bbc21e8eb6575181a61ad Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 22 Jun 2021 20:56:48 +0800
Subject: [PATCH] 1.app 当前保安对应警情列表接口合并 2.取证上报（意见反馈）page 自定义类别接口修改合并

---
 src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml |   18 ++++++++++++++++--
 1 files changed, 16 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..4e6c8f7 100644
--- a/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml
+++ b/src/main/java/org/springblade/modules/feedback/mapper/FeedbackMapper.xml
@@ -43,11 +43,25 @@
         <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,
        ctime,feedbackaudio,feedbackvideo,feedbackphoto,jd,wd,tname) VALUES (#{jid},#{snumber},#{sname},#{addvcd},#{place},#{result},#{describe},#{type},

--
Gitblit v1.9.3