From 9e176039298e3317a7342da9d2c94dc6f9a18f69 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 11 Oct 2024 22:45:46 +0800
Subject: [PATCH] 水库普查填报未普查完成保存报错、文字不能在提交修改为不能再提交

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

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 012552e..273bde8 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
@@ -79,7 +79,7 @@
 			state.setCreateUser(entity.getCreateUser());
 		} else {
 			if (state.getCheckState() > 1) {
-				return R.fail(entity.getDykeName() + "本年度已经普查完成,不能在提交了。");
+				return R.fail(entity.getDykeName() + "本年度已经普查完成,不能再提交了。");
 			}
 		}
 
@@ -133,8 +133,8 @@
 			state.setCreateUser(entity.getCreateUser());
 		} else {
 			//查看填报状态,只有0填报中才可以一直填报
-			if (state.getCheckState() == 1 || state.getCheckState() == 2) {
-				return R.fail(entity.getDykeName() + "本年度已经普查完成,不能在提交了。");
+			if (state.getCheckState() > 1) {
+				return R.fail(entity.getDykeName() + "本年度已经普查完成,不能再提交了。");
 			}
 		}
 

--
Gitblit v1.9.3