From 2f10ca63b173d7abfa5dba60609ca3128d25582a Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 25 Sep 2024 20:37:33 +0800
Subject: [PATCH] 白蚁提防水库普查、提防普查填报增加季度
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml | 6 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java | 2 ++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
index 0c992fd..d798367 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbDykeUnitDangerMapper.xml
@@ -12,6 +12,12 @@
<if test="params.dykeGuid != null and params.dykeGuid != ''">
and "dyke_guid" = #{params.dykeGuid}
</if>
+ <if test="params.tbYear != null and params.tbYear != ''">
+ and "tb_year" = #{params.tbYear}
+ </if>
+ <if test="params.tbQuarter != null and params.tbQuarter != ''">
+ and "tb_quarter" = #{params.tbQuarter}
+ </if>
group by "dyke_guid","unit"
) tdi
left join sjzt_md."tb_dyke_unit_danger" tdud on (tdi.dykeGuid = tdud."dyke_id" and tdi."unit" = tdud."unit")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
index ffa70e9..5d129ec 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
@@ -78,7 +78,7 @@
state.setCreateTime(entity.getCreateTime());
state.setCreateUser(entity.getCreateUser());
} else {
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
+ if (state.getCheckState() > 1) {
return R.fail(entity.getDykeName() + "本年度已经普查完成，不能在提交了。");
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
index d0917c9..d410e91 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
@@ -78,7 +78,7 @@
state.setCreateTime(entity.getCreateTime());
state.setCreateUser(entity.getCreateUser());
} else {
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
+ if (state.getCheckState() > 1) {
return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
}
}
@@ -120,7 +120,7 @@
state.setCreateUser(entity.getCreateUser());
} else {
//查看填报状态，只有0填报中才可以一直填报
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
+ if (state.getCheckState() <= 3) {
return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java
index 67dfc04..585adca 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbDykeUnitDangerVO.java
@@ -11,6 +11,8 @@
public class TbDykeUnitDangerVO {
private String dykeGuid;//提防id
+ private Integer tbYear;//提防id
+ private String tbQuarter;//提防id
private String unit;//提防单元
private String dangerNum;//危害处数
private String hdjxs;//活动迹象
--
Gitblit v1.9.3