From 160c57b0cf5d520dbd2005496247f18ca0b9ced1 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 28 Sep 2024 16:14:09 +0800
Subject: [PATCH] 普查统计水库按已校核统计
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml
index 081a6a0..33111ab 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml
@@ -95,10 +95,10 @@
FROM(
SELECT
COUNT(*) totalNum,
- SUM(CASE WHEN (trgis."check_state" = 3) THEN 1 ELSE 0 END) as finishNum
+ SUM(CASE WHEN (trgis."check_state" >= 2) THEN 1 ELSE 0 END) as finishNum
from
<include refid="resBase"/>
- LEFT JOIN SJZT_MD."tb_res_general_investigation_state" trgis ON trgis."res_guid" = arb."code" AND (trgis."check_state" = 3)
+ LEFT JOIN SJZT_MD."tb_res_general_investigation_state" trgis ON trgis."res_guid" = arb."code" AND (trgis."check_state" >= 2)
<if test="params.tbYear != null and params.tbYear !=''">
AND trgis."tb_year" = #{params.tbYear}
</if>
@@ -151,7 +151,7 @@
LEFT JOIN YWXT."att_ad_base" province ON province."ad_code" = city."p_ad_code"
where (town."ad_code" = aab."guid" or county."ad_code" = aab."guid" or city."ad_code" = aab."guid" or province."ad_code" = aab."guid")
<!--只有已审核数据才显示-->
- and (trgis."check_state" = 3 and totalDangerNum > 0)
+ and (trgis."check_state" >= 2 and totalDangerNum > 0)
)
) dangerNum
FROM YWXT."att_ad_base" aab
@@ -441,7 +441,7 @@
<if test="params.tbQuarter != null and params.tbQuarter !=''">
AND trgis."tb_quarter" = #{params.tbQuarter}
</if>
- and trgis."check_state" = 3
+ and trgis."check_state" >= 2
)checkResNum,
(
SELECT COUNT(*) FROM
@@ -468,7 +468,7 @@
<if test="params.tbQuarter != null and params.tbQuarter !=''">
AND trgis."tb_quarter" = #{params.tbQuarter}
</if>
- and trgis."check_state" = 3 and trgis.dangerNum is not null
+ and trgis."check_state" >= 2 and trgis.dangerNum is not null
)resMayiNum,
(
SELECT COUNT(*)
@@ -494,7 +494,7 @@
<if test="params.tbQuarter != null and params.tbQuarter !=''">
AND tdis."tb_quarter" = #{params.tbQuarter}
</if>
- and (tdis."check_state" = 1 or tdis."check_state" = 2 or tdis."check_state" = 3)
+ and (tdis."check_state" >=1)
)investigationDykeNum,
(
SELECT COUNT(*) FROM
@@ -511,7 +511,7 @@
<if test="params.tbQuarter != null and params.tbQuarter !=''">
AND tdis."tb_quarter" = #{params.tbQuarter}
</if>
- and (tdis."check_state" = 2 or tdis."check_state" = 3)
+ and (tdis."check_state" >= 2)
)checkDykeNum,
IFNULL(
(
@@ -580,7 +580,7 @@
group by tdi."tb_state_id",tdi."dyke_guid",tdi."unit"
)TEMP1
) tdi on tdi."tb_state_id" = tdis."guid"
- where (tdis."check_state" = 3)
+ where (tdis."check_state" >= 2)
) trd
LEFT JOIN YWXT."att_ad_base" county ON county."ad_code" = trd."ad_code"
LEFT JOIN YWXT."att_ad_base" city ON city."ad_code" = county."p_ad_code"
--
Gitblit v1.9.3