From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 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 341f808..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,12 +95,15 @@
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>
+ <if test="params.tbQuarter != null and params.tbQuarter !=''">
+ AND trgis."tb_quarter" = #{params.tbQuarter}
</if>
WHERE 1=1
<if test="params.adCode != null and params.adCode !=''">
@@ -136,6 +139,9 @@
<if test="params.tbYear != null and params.tbYear !=''">
AND TRGI."tb_year" = #{params.tbYear}
</if>
+ <if test="params.tbQuarter != null and params.tbQuarter !=''">
+ AND TRGI."tb_quarter" = #{params.tbQuarter}
+ </if>
group by TRGI."tb_state_id",TRGI."res_guid"
) tmp on tmp."tb_state_id" = trgis."guid"
LEFT JOIN SJZT_MD."att_res_base" arb on arb."code" = trgis."res_guid"
@@ -145,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
@@ -414,6 +420,9 @@
<if test="params.tbYear != null and params.tbYear !=''">
and trgis."tb_year" = #{params.tbYear}
</if>
+ <if test="params.tbQuarter != null and params.tbQuarter !=''">
+ AND trgis."tb_quarter" = #{params.tbQuarter}
+ </if>
and (trgis."check_state" > 1)
)investigationResNum,
(
@@ -429,7 +438,10 @@
<if test="params.tbYear != null and params.tbYear !=''">
and trgis."tb_year" = #{params.tbYear}
</if>
- and trgis."check_state" = 3
+ <if test="params.tbQuarter != null and params.tbQuarter !=''">
+ AND trgis."tb_quarter" = #{params.tbQuarter}
+ </if>
+ and trgis."check_state" >= 2
)checkResNum,
(
SELECT COUNT(*) FROM
@@ -453,7 +465,10 @@
<if test="params.tbYear != null and params.tbYear !=''">
and trgis."tb_year" = #{params.tbYear}
</if>
- and trgis."check_state" = 3 and trgis.dangerNum is not null
+ <if test="params.tbQuarter != null and params.tbQuarter !=''">
+ AND trgis."tb_quarter" = #{params.tbQuarter}
+ </if>
+ and trgis."check_state" >= 2 and trgis.dangerNum is not null
)resMayiNum,
(
SELECT COUNT(*)
@@ -476,7 +491,10 @@
<if test="params.tbYear != null and params.tbYear !=''">
and tdis."tb_year" = #{params.tbYear}
</if>
- and (tdis."check_state" = 1 or tdis."check_state" = 2 or tdis."check_state" = 3)
+ <if test="params.tbQuarter != null and params.tbQuarter !=''">
+ AND tdis."tb_quarter" = #{params.tbQuarter}
+ </if>
+ and (tdis."check_state" >=1)
)investigationDykeNum,
(
SELECT COUNT(*) FROM
@@ -490,7 +508,10 @@
<if test="params.tbYear != null and params.tbYear !=''">
and tdis."tb_year" = #{params.tbYear}
</if>
- and (tdis."check_state" = 2 or tdis."check_state" = 3)
+ <if test="params.tbQuarter != null and params.tbQuarter !=''">
+ AND tdis."tb_quarter" = #{params.tbQuarter}
+ </if>
+ and (tdis."check_state" >= 2)
)checkDykeNum,
IFNULL(
(
@@ -500,6 +521,9 @@
<where>
<if test="params.tbYear != null and params.tbYear !=''">
and tdis."tb_year" = #{params.tbYear}
+ </if>
+ <if test="params.tbQuarter != null and params.tbQuarter !=''">
+ AND tdis."tb_quarter" = #{params.tbQuarter}
</if>
and tdis."check_state" >= 2
</where>
@@ -550,10 +574,13 @@
<if test="params.tbYear != null and params.tbYear != ''">
AND tdi."tb_year" = #{params.tbYear}
</if>
+ <if test="params.tbQuarter != null and params.tbQuarter !=''">
+ AND tdi."tb_quarter" = #{params.tbQuarter}
+ </if>
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