From 4f6818dcfdfeb6f36857cd7c18677f4f85de5e0d Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 28 Jun 2024 16:53:39 +0800
Subject: [PATCH] 普查统计提防危害长度和填报长度
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTable.java | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.xml | 4 ++--
2 files changed, 4 insertions(+), 4 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 54bcb4e..e85d5e9 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
@@ -501,7 +501,7 @@
<if test="params.tbYear != null and params.tbYear !=''">
and tdis."tb_year" = #{params.tbYear}
</if>
- and tdis."check_state" = 3
+ and tdis."check_state" >= 2
</where>
) trd
LEFT JOIN ywxt."att_ad_base" county on county."ad_code" = trd."ad_code"
@@ -553,7 +553,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" = 1 or tdis."check_state" = 2 or tdis."check_state" = 3)
+ where (tdis."check_state" = 3)
) 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"
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTable.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTable.java
index 1e02c78..fe635f1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTable.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTable.java
@@ -34,9 +34,9 @@
//堤防总长度
private double dykeTotalLength;
- //堤防危害长度
+ //堤防危害长度（根据审核通过状态）
private double dangerTotalLength;
- //堤防填报长度（根据审核通过状态的提防长度）
+ //堤防填报长度（根据校核通过状态）
private double tbDykeLength;
}
--
Gitblit v1.9.3