From a6bcf9902e3301deeff27673ab6b92d3982d6bde Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 02 Mar 2021 23:12:02 +0800
Subject: [PATCH] 警情分发新增接口修改，体温数据实体类修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 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..8332563 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">
@@ -76,13 +94,13 @@
         </if>
     </select>
 
-  <!--  <insert id="insert">
-        insert into sys_jingdan(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,
-        handleP,handleTime,handName,level,coordinate,jd,wd,addvcd)
-        values (#{galarmPeople},#{phoneNumber},#{place},#{content},#{galarmTime}
-        ,#{waringType},#{deviceNumber},#{type},#{handleP},#{handleTime},
-        #{handName},#{level},POINT(#{jd},#{wd}),#{jd},#{wd},#{addvcd})
-    </insert>-->
+<!--    <insert id="insert">-->
+<!--        insert into sys_jingdan(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,-->
+<!--        handleP,handleTime,handName,level,coordinate,jd,wd,addvcd)-->
+<!--        values (#{galarmPeople},#{phoneNumber},#{place},#{content},#{galarmTime}-->
+<!--        ,#{waringType},#{deviceNumber},#{type},#{handleP},#{handleTime},-->
+<!--        #{handName},#{level},POINT(#{jd},#{wd}),#{jd},#{wd},#{addvcd})-->
+<!--    </insert>-->
 
 
     <sql id="key">
@@ -184,6 +202,9 @@
             <if test="level!=null and level!=''">
                 #{level},
             </if>
+            <if test="coordinate=null and coordinate=''">
+                coordinate,
+            </if>
             <if test="jd!=null and wd!=null">
                 POINT(#{jd},#{wd}),
             </if>

--
Gitblit v1.9.3