From 6e59268afb4487519d0dbea2e7897eee85bc416f Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 28 Sep 2024 16:20:09 +0800
Subject: [PATCH] 普查统计提防按已校核统计

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

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeInvestigationMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeInvestigationMapper.xml
index 0fe2914..6121e22 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeInvestigationMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeInvestigationMapper.xml
@@ -11,10 +11,10 @@
 
         SELECT
         COUNT(*) totalNum,
-        SUM(CASE WHEN  (tdis."check_state" = 3) THEN 1 ELSE 0 END) as finishNum
+        SUM(CASE WHEN  (tdis."check_state" >= 2) THEN 1 ELSE 0 END) as finishNum
         from
         SJZT_MD."tb_res_dyke" trd
-        LEFT JOIN SJZT_MD."tb_dyke_investigation_state" tdis ON tdis."dyke_guid" = trd."guid" AND (tdis."check_state" = 3)
+        LEFT JOIN SJZT_MD."tb_dyke_investigation_state" tdis ON tdis."dyke_guid" = trd."guid" AND (tdis."check_state" >= 2)
         <if test="params.tbYear != null and params.tbYear !=''">
             AND tdis."tb_year" = #{params.tbYear}
         </if>
@@ -50,7 +50,7 @@
         CASE WHEN dykeTmp.termiteLength THEN dykeTmp.termiteLength ELSE 0 END as termiteLength
         FROM
         sjzt_md."tb_res_dyke" trd
-        LEFT JOIN SJZT_MD."tb_dyke_investigation_state" tdis ON tdis."dyke_guid" = trd."guid" AND (tdis."check_state" = 1 or tdis."check_state" = 2)
+        LEFT JOIN SJZT_MD."tb_dyke_investigation_state" tdis ON tdis."dyke_guid" = trd."guid" AND (tdis."check_state" >= 2)
         LEFT JOIN (
         SELECT
         TEMP1.*,

--
Gitblit v1.9.3