From 396ddbe04881d0a9ddf2b03fb360fd298c0c4984 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 11:11:17 +0800
Subject: [PATCH] 1.健康码接口 2.统计接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
index 360a982..9e719e8 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.xml
@@ -56,21 +56,20 @@
GROUP BY
s.addvcd
</select>
+
<select id="selectEq" resultType="java.util.HashMap">
SELECT
COUNT(*) AS value,
s.addvcd,
- d.addvnm as name
+ jfpth.blade_region.name as name
FROM
sys_equipment s
- INNER JOIN sys_district d ON d.addvcds = s.addvcd
+ INNER JOIN jfpth.blade_region on jfpth.blade_region.`code`=s.addvcd
WHERE s.parent_id!=0
-GROUP BY
- s.addvcd
+ GROUP BY s.addvcd,jfpth.blade_region.name
</select>
<select id="selectWar" resultType="java.util.HashMap">
- SELECT COUNT(*) as cou,waringType FROM `sys_alarm` GROUP BY waringType ORDER BY cou desc
+ SELECT COUNT(*) as cou,waringType FROM `sys_alarm` where DATE_FORMAT(alarmTime,'%Y-%m-%d')>=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d')<=#{endTime} GROUP BY waringType ORDER BY cou desc
</select>
-
</mapper>
--
Gitblit v1.9.3