From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +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 | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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..90c48ea 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
@@ -36,6 +36,7 @@
import java.io.IOException;
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -68,18 +69,18 @@
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();
state.setResGuid(entity.getResGuid());
state.setTbQuarter(entity.getTbQuarter());
state.setTbYear(entity.getTbYear());
- state.setCreateTime(entity.getCreateTime());
- state.setCreateUser(entity.getCreateUser());
+ state.setCreateTime(new Date());
+ state.setCreateUser(AuthUtil.getUserAccount());
} else {
- if (state.getCheckState() == 1 || state.getCheckState() == 2) {
- return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
+ if (state.getCheckState() > 1) {
+ return R.fail(entity.getResName() + "本年度已经普查完成，不能再提交了。");
}
}
@@ -108,6 +109,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) {
//无填报状态记录则新建
@@ -115,12 +117,12 @@
state.setResGuid(entity.getResGuid());
state.setTbQuarter(entity.getTbQuarter());
state.setTbYear(entity.getTbYear());
- state.setCreateTime(entity.getCreateTime());
- state.setCreateUser(entity.getCreateUser());
+ state.setCreateTime(new Date());
+ state.setCreateUser(AuthUtil.getUserAccount());
} 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