From 71b6b716361c52af290493d365a328fc1a3467e2 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 11:15:06 +0800
Subject: [PATCH] 1.统计接口 2.健康码
---
src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml
index 5e80035..c070591 100644
--- a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml
+++ b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml
@@ -52,7 +52,7 @@
d.addvnm as name
FROM
sys_suser s
- LEFT JOIN sys_district d ON d.addvcds = s.addvcd
+ INNER JOIN sys_district d ON d.addvcds = s.addvcd
GROUP BY
s.addvcd
</select>
@@ -60,16 +60,15 @@
SELECT
COUNT(*) AS value,
s.addvcd,
- d.addvnm as name
+ jfpth.blade_region.name as name
FROM
sys_equipment s
- LEFT 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
+ 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>
--
Gitblit v1.9.3