From 7b3fb2ea4eb3c8539ce3019bfafacb7ca3b21096 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Tue, 02 Mar 2021 10:06:13 +0800
Subject: [PATCH] 1.目录树调整

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml
index 04435f0..ff573d5 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml
@@ -27,7 +27,25 @@
 
 
     <select id="selectJingdanPage" resultMap="jingdanResultMap">
-        select * from sys_jingdan where is_deleted = 0
+        SELECT j.id,j.galarmPeople,j.phoneNumber,j.place,j.content,j.galarmTime,j.waringType,j.deviceNumber,j.type,
+        j.handleP,j.handleTime,j.handName,j.level,ST_ASTEXT(j.coordinate) as coordinate,j.jd,j.wd,j.addvcd,j.rName,
+        d.addvnm FROM sys_jingdan j LEFT JOIN sys_district d on d.addvcds=j.addvcd where 1=1
+        <if test="jingdan.waringType!=null and jingdan.waringType!=''">
+            and j.waringType=#{jingdan.waringType}
+        </if>
+        <if test="jingdan.beginTime!=null and jingdan.beginTime!=''">
+            and j.galarmTime &gt;=#{jingdan.beginTime}
+        </if>
+        <if test="jingdan.endTime!=null and jingdan.endTime!=''">
+            and j.galarmTime &lt;=#{jingdan.endTime}
+        </if>
+        <if test="jingdan.addvcd!=null and jingdan.addvcd!=''">
+            and j.addvcd=#{jingdan.addvcd}
+        </if>
+        <if test="jingdan.type!=null and jingdan.type!=''">
+            and j.type=#{jingdan.type}
+        </if>
+        ORDER BY j.type asc
     </select>
 
     <select id="selectList" resultMap="jingdanResultMap">

--
Gitblit v1.9.3