From fc2adc3521931c2f7bc5b2f3a3d94ebf407828d6 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 01 Jul 2024 09:40:55 +0800
Subject: [PATCH] 水库堤防白蚁普查资料当前页压缩导出新增条件优化v20240701
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java
index 80d9129..863fc73 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.sjztmd.entity.TbAttResEngBene;
import cn.gistack.sm.sjztmd.mapper.TbAttResEngBeneMapper;
+import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResEngBeneService;
import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -27,6 +28,9 @@
@Autowired
private IUserClient userClient;
+ @Autowired
+ private ITbAttResBaseService tbAttResBaseService;
+
/**
* 查询水库填报详情信息
* @param guid
@@ -44,6 +48,11 @@
*/
@Override
public boolean updateByGuid(TbAttResEngBene tbAttResEngBene) {
+ boolean edit = false;
+ // 编辑标记
+ if (tbAttResEngBene.getCheckState()==4){
+ edit = true;
+ }
// 查询是否存在
TbAttResEngBene detail = baseMapper.getDetailByResGuid(tbAttResEngBene.getResGuid());
// 更新日志
@@ -51,6 +60,9 @@
// 修改
int i = addOrUpdateByGuid(detail,tbAttResEngBene);
if (i>0){
+// if (!edit) {
+// tbAttResBaseService.updateFinalState(tbAttResEngBene.getResGuid(), 0);
+// }
return true;
}
return false;
@@ -63,6 +75,11 @@
*/
@Override
public boolean auditByGuid(TbAttResEngBene tbAttResEngBene) {
+ boolean edit = false;
+ // 编辑标记
+ if (tbAttResEngBene.getCheckState()==4){
+ edit = true;
+ }
// 查询是否存在
TbAttResEngBene detail = baseMapper.getDetailByResGuid(tbAttResEngBene.getResGuid());
// 更新操作日志
@@ -76,9 +93,13 @@
if (tbAttResEngBene.getCheckState()==3){
tbAttResEngBene.setCheckState(0);
}
+ detail.setCheckState(tbAttResEngBene.getCheckState());
// 更新数据
- int i = baseMapper.updateById(tbAttResEngBene);
+ int i = baseMapper.updateById(detail);
if (i>0){
+ if (!edit) {
+ tbAttResBaseService.updateFinalState(tbAttResEngBene.getResGuid(), tbAttResEngBene.getCheckState());
+ }
return true;
}
return false;
@@ -92,8 +113,10 @@
private int addOrUpdateByGuid(TbAttResEngBene oldAbAttResBase,TbAttResEngBene tbAttResEngBene){
int i = 0;
if (null!=oldAbAttResBase){
+ tbAttResEngBene.setGuid(oldAbAttResBase.getGuid());
// 更新
i = baseMapper.updateById(tbAttResEngBene);
+ tbAttResBaseService.updateFinalState(tbAttResEngBene.getResGuid(), tbAttResEngBene.getCheckState());
}else {
tbAttResEngBene.setCreateTime(new Date());
i = baseMapper.insert(tbAttResEngBene);
@@ -160,6 +183,11 @@
if (newTbAttResEngBene.getCheckState()==3){
fillName = "退回" + (null==newTbAttResEngBene.getCheckLog()?"":":" + newTbAttResEngBene.getCheckLog());
}
+ // 管理员编辑
+ if (newTbAttResEngBene.getCheckState()==4){
+ fillName = "编辑";
+ newTbAttResEngBene.setCheckState(oldAbAttResBase.getCheckState());
+ }
// 拼接
String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
--
Gitblit v1.9.3