From b6673e839cde1597511e56b154e2fe02ee54ed63 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 26 Sep 2024 12:01:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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..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
@@ -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,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() + "本年度已经普查完成，不能在提交了。");
}
}
@@ -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,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() + "本年度已经普查完成，不能在提交了。");
}
}
--
Gitblit v1.9.3