From 0747f27901a87199f01b1df14e36c27bfd8f34a6 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 04 Nov 2024 23:05:12 +0800
Subject: [PATCH] 白蚁防治填报时间
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 d410e91..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;
@@ -75,11 +76,11 @@
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) {
- return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
+ return R.fail(entity.getResName() + "本年度已经普查完成，不能再提交了。");
}
}
@@ -116,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() <= 3) {
- return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
+ if (state.getCheckState() > 1) {
+ return R.fail(entity.getResName() + "本年度已经普查完成，不能再提交了。");
}
}
--
Gitblit v1.9.3