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/TbResGeneralInvestigationServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
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 cb89900..ee8140c 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
@@ -68,7 +68,7 @@
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("\"res_guid\"", entity.getResGuid());
queryWrapper.eq("\"tb_year\"", entity.getTbYear());
-// queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
+ queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
TbResGeneralInvestigationState state = tbResGeneralInvestigationStateService.getOne(queryWrapper);
if (null == state) {
state = new TbResGeneralInvestigationState();
@@ -78,8 +78,8 @@
state.setCreateTime(entity.getCreateTime());
state.setCreateUser(entity.getCreateUser());
} else {
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
- return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
+ if (state.getCheckState() > 1) {
+ return R.fail(entity.getResName() + "本年度已经普查完成，不能再提交了。");
}
}
@@ -108,6 +108,7 @@
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("\"res_guid\"", entity.getResGuid());
queryWrapper.eq("\"tb_year\"", entity.getTbYear());
+ queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
TbResGeneralInvestigationState state = tbResGeneralInvestigationStateService.getOne(queryWrapper);
if (null == state) {
//无填报状态记录则新建
@@ -119,8 +120,8 @@
state.setCreateUser(entity.getCreateUser());
} else {
//查看填报状态，只有0填报中才可以一直填报
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
- return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
+ if (state.getCheckState() > 1) {
+ return R.fail(entity.getResName() + "本年度已经普查完成，不能再提交了。");
}
}
--
Gitblit v1.9.3