From d147fc0efe768362d378bea2d68243718afea860 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 23 Feb 2021 14:45:24 +0800
Subject: [PATCH] 客户管理接口改动
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index caf4216..0392375 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -71,7 +71,9 @@
<if test="alarm.endTime!=null and alarm.endTime!=''">
and a.alarmTime<=#{alarm.endTime}
</if>
- ORDER BY a.alarmTime desc
+ ORDER BY
+ a.jtype ASC,
+ a.alarmTime DESC
</select>
<select id="selectList" resultMap="alarmResultMap">
@@ -106,7 +108,7 @@
<if test="jtype!=null and jtype!=''">
and a.jtype=#{jtype}
</if>
- <if test="addvcd!=null and addvcd!=''">
+ <if test="district!=null and district!=''">
and a.district=#{district}
</if>
<if test="waringType!=null and waringType!=''">
@@ -121,6 +123,11 @@
ORDER BY id ASC
</select>
+ <select id="getLimit" resultMap="alarmResultMap">
+ select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
+ a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city from sys_alarm a ORDER BY id DESC LIMIT 1
+ </select>
+
<select id="selectInfo" resultMap="alarmResultMap">
SELECT
a.id,
--
Gitblit v1.9.3