From 301b0a0ea3eb1f65a79d364dd0ef19f2e7b62ec9 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Fri, 05 Jul 2024 09:11:54 +0800
Subject: [PATCH] 堤防水库危害统计修改总座数和总公里数逻辑v20240705

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResAndDykeAllMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResAndDykeAllMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResAndDykeAllMapper.xml
index d13daa4..eefb432 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResAndDykeAllMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResAndDykeAllMapper.xml
@@ -29,7 +29,7 @@
         SELECT
         a."ad_code" CODE,
         a."ad_name" NAME,
-        count( b."danger_level" ) AS resNum,
+        count( b."guid" ) AS resNum,
         sum( CASE WHEN b."eng_scal" = '大(1)型' AND b."danger_level" = '1' THEN 1 ELSE 0 END ) AS bigOneNum,
         sum( CASE WHEN b."eng_scal" = '大(1)型' AND b."danger_level" = '2' THEN 1 ELSE 0 END ) AS bigTwoNum,
         sum( CASE WHEN b."eng_scal" = '大(1)型' AND b."danger_level" = '3' THEN 1 ELSE 0 END ) AS bigThreeNum,
@@ -49,6 +49,7 @@
         YWXT."att_ad_base" a
         LEFT JOIN (
         SELECT
+        a."guid",
         c."danger_level",
         a."eng_scal",
         e."guid" AS countyCode,
@@ -75,7 +76,7 @@
         SELECT
         a."ad_code" CODE,
         a."ad_name" NAME,
-        sum( b."danger_length" ) AS lengthSum,
+        sum( b."dyke_length" ) AS lengthSum,
         sum( CASE WHEN b."dyke_level" = '1级' AND b."danger_level" = '1' THEN b."danger_length" ELSE 0 END ) AS levelOneLengthOne,
         sum( CASE WHEN b."dyke_level" = '1级' AND b."danger_level" = '2' THEN b."danger_length" ELSE 0 END ) AS levelOneLengthTwo,
         sum( CASE WHEN b."dyke_level" = '1级' AND b."danger_level" = '3' THEN b."danger_length" ELSE 0 END ) AS levelOneLengthThree,
@@ -95,6 +96,7 @@
         YWXT."att_ad_base" a
         RIGHT JOIN (
         SELECT
+        a."dyke_length",
         a."dyke_level",
         c."danger_level",
         c."danger_length",

--
Gitblit v1.9.3