From 946a727ec1d3c38f178884d3610f13677cf74a6b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 07 Aug 2023 16:16:13 +0800
Subject: [PATCH] 修改大坝表格查询逻辑
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
index ee45489..4fbcf9c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
@@ -267,11 +267,11 @@
info."city_ad_code" AS cityCode,
info."city_ad_name" AS cityName,
(info.wy+info.sy+info.sl) AS total,
- (info.wy+info.sy+info.sl-info.errorNum) AS normalNum,
+ (info.wy+info.sy+info.sl-info.errorCountNum) AS normalNum,
info.errorNum AS errorNum
FROM
(
- SELECT baseRes.*,ifnull(wy.wyStation,0) wy ,ifnull(sy.syStation,0) sy,ifnull(sl.slStation,0) sl,ifnull(alarm.errorNum,0) errorNum FROM
+ SELECT baseRes.*,ifnull(wy.wyStation,0) wy ,ifnull(sy.syStation,0) sy,ifnull(sl.slStation,0) sl,ifnull(alarm.errorNum,0) errorNum, ifnull(c1.errorCountNum,0) errorCountNum FROM
(
SELECT
a."guid",
@@ -322,6 +322,9 @@
GROUP BY "res_cd"
) sl ON sl."res_cd" = baseRes."guid"
LEFT JOIN ( SELECT DAM_ID ,COUNT(*) errorNum FROM NKY_ALARM_GET GROUP BY "DAM_ID" ) alarm ON alarm.DAM_ID = baseRes."guid"
+
+ LEFT JOIN (SELECT DAM_ID ,COUNT(*) errorCountNum FROM (SELECT DAM_ID, COUNT(*) FROM YWXT.NKY_ALARM_GET GROUP BY DAM_ID,POINT_ID) baseCount GROUP BY DAM_ID) c1 ON c1.dam_id = baseRes."guid"
+
LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = "town_ad_code"
LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code"
LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code"
@@ -336,6 +339,10 @@
AND "name" LIKE CONCAT('%',#{dam.resName},'%')
</if>
+ <if test="dam.dateRange !=null and dam.dateRange.length > 0">
+ AND time >= #{dam.daterange[0]} AND time <= #{dam.daterange[1]}
+ </if>
+
) info
</select>
--
Gitblit v1.9.3