From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
index ec5b391..b3bbba8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -21,10 +21,15 @@
b."guid" as tbStateId,
b."tb_year",
b."tb_quarter",
+ ifnull(b."danger_level",'无') dangerLevel,
(CASE WHEN tmp.totalDangerNum>0 THEN 1 ELSE 2 END) as hasDanger,
tmp.totalDangerNum,
tmp.termiteNum,
tmp.otherNum,
+ ifnull(tmp.totalDanger,0) totalDanger,
+ ifnull(tmp.totalDangerSr,0) totalDangerSr,
+ ifnull(tmp.totalDangerCb,0) totalDangerCb,
+ ifnull(tmp.totalDangerDw,0) totalDangerDw,
case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
@@ -61,7 +66,11 @@
SUM(CASE WHEN (trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS totalDangerNum,
SUM(CASE WHEN (trgi."investigation_variety" = '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS termiteNum,
- SUM(CASE WHEN (trgi."investigation_variety" != '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS otherNum
+ SUM(CASE WHEN (trgi."investigation_variety" != '白蚁' and trgi."hazard_rating" != '无危害') THEN 1 ELSE 0 END) AS otherNum,
+ SUM(CASE WHEN (trgi."is_danger" != '否') THEN 1 ELSE 0 END) AS totalDanger,
+ SUM(CASE WHEN (json_value(trgi."danger_info", '$.sr') != '') THEN json_value(trgi."danger_info", '$.sr') ELSE 0 END) AS totalDangerSr,
+ SUM(CASE WHEN (json_value(trgi."danger_info", '$.cb') != '') THEN json_value(trgi."danger_info", '$.cb') ELSE 0 END) AS totalDangerCb,
+ SUM(CASE WHEN (json_value(trgi."danger_info", '$.dw') != '') THEN json_value(trgi."danger_info", '$.dw') ELSE 0 END) AS totalDangerDw
from sjzt_md."tb_res_general_investigation" trgi
where 1=1
<if test="attResBase.tbYear !=null and attResBase.tbYear !=''">
@@ -103,6 +112,9 @@
<if test="attResBase.hasDanger != null and attResBase.hasDanger != '' ">
and base.hasDanger = #{attResBase.hasDanger}
</if>
+ <if test="attResBase.dangerLevel != null and attResBase.dangerLevel != '' ">
+ and base.dangerLevel = #{attResBase.dangerLevel}
+ </if>
</select>
--
Gitblit v1.9.3