From 0ddc1f8a76db258155f5ce36388b98bc75be7d0b Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 14:31:03 +0800
Subject: [PATCH] 统计
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index 511150c..c36cf32 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -61,23 +61,23 @@
select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,ST_ASTEXT (coordinate ) AS
coordinate,dtype,heartbeat,expireTime,pay,
parent_id,
- FORMAT( jd, 6 ) AS jd,
- FORMAT( wd, 6 ) AS wd,
+ jd ,
+ wd ,
street,
addvcd,pay,expireTime from sys_equipment where 1=1
- <if test="deviceName!=null">
- and (deviceName like concat('%',#{deviceName},'%') or deviceNumber like
- concat('%',#{deviceName},'%'))
+ <if test="equipment.deviceName!=null">
+ and (deviceName like concat('%',#{equipment.deviceName},'%') or deviceNumber like
+ concat('%',#{equipment.deviceName},'%'))
</if>
- <if test="addvcd!=null">
- and addvcd=#{addvcd}
+ <if test="equipment.addvcd!=null">
+ and addvcd=#{equipment.addvcd}
</if>
- <if test="devicestate!=null">
- and devicestate =#{devicestate}
+ <if test="equipment.devicestate!=null">
+ and devicestate =#{equipment.devicestate}
</if>
- <if test="dtype!=null">
- and dtype=#{dtype}
+ <if test="equipment.dtype!=null">
+ and dtype=#{equipment.dtype}
</if>
</select>
@@ -156,7 +156,7 @@
dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
dept.ownerId,dept.devicestate,dept.stime,
ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat,
- dept.parent_id,dept.jd,dept.wd,dept.street as streeName,u.yname,d.addvnm,dept.addvcd,
+ dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,
(
SELECT
CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
--
Gitblit v1.9.3