From 8d5f3db4e1e88b77cb3dc04565ad007f2421c74e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 20 Mar 2024 09:28:04 +0800
Subject: [PATCH] 普查填报逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 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 fb135ae..bb8f766 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
@@ -57,6 +57,8 @@
// 是否普查完成 1是 0否
if (entity.getCheckState() != 0) {
state.setCheckState(entity.getIsInvCom());
+ }else{
+ state.setCheckState(0);
}
tbResGeneralInvestigationStateService.saveOrUpdate(state);
@@ -93,31 +95,31 @@
state.setCheckState(tbResGeneralInvestigationParam.getCheckState());
tbResGeneralInvestigationStateService.saveOrUpdate(state);
- //先把数据移除
- QueryWrapper delete = new QueryWrapper();
- delete.eq("\"tb_state_id\"",state.getGuid());
- boolean remove = remove(delete);
+// //先把数据移除
+// QueryWrapper delete = new QueryWrapper();
+// delete.eq("\"tb_state_id\"",state.getGuid());
+// boolean remove = remove(delete);
+//
+// if (remove){
+//
+// }
- if (remove){
- for (int i = 0; i < list.size(); i++) {
- TbResGeneralInvestigation tbResGeneralInvestigation = list.get(i);
- //id清空方便批量新增
- tbResGeneralInvestigation.setGuid("");
+ for (int i = 0; i < list.size(); i++) {
+ TbResGeneralInvestigation tbResGeneralInvestigation = list.get(i);
+ //id清空方便批量新增
+// tbResGeneralInvestigation.setGuid("");
- if (tbResGeneralInvestigation.getCreateTime() == null){
- tbResGeneralInvestigation.setCreateTime(DateUtil.now());
- }
-
- if (tbResGeneralInvestigation.getCreateUser() == null){
- tbResGeneralInvestigation.setCreateUser(AuthUtil.getUserId().toString());
- }
-
- //设置状态表id
- tbResGeneralInvestigation.setTbStateId(state.getGuid());
+ if (tbResGeneralInvestigation.getCreateTime() == null){
+ tbResGeneralInvestigation.setCreateTime(DateUtil.now());
}
- return R.status(saveOrUpdateBatch(list));
- }
- return R.fail("操作失败");
+ if (tbResGeneralInvestigation.getCreateUser() == null){
+ tbResGeneralInvestigation.setCreateUser(AuthUtil.getUserId().toString());
+ }
+
+ //设置状态表id
+ tbResGeneralInvestigation.setTbStateId(state.getGuid());
+ }
+ return R.status(saveOrUpdateBatch(list));
}
}
--
Gitblit v1.9.3