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/TbAttResStagCharServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResStagCharServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResStagCharServiceImpl.java
index 77c419e..a6fc0f5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResStagCharServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResStagCharServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.sjztmd.entity.TbAttResStagChar;
import cn.gistack.sm.sjztmd.mapper.TbAttResStagCharMapper;
+import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResStagCharService;
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(TbAttResStagChar tbAttResStagChar) {
+ boolean edit = false;
+ // 编辑标记
+ if (tbAttResStagChar.getCheckState()==4){
+ edit = true;
+ }
// 查询是否存在
TbAttResStagChar detail = baseMapper.getDetailByResGuid(tbAttResStagChar.getResGuid());
// 更新日志
@@ -51,6 +60,9 @@
// 修改
int i = addOrUpdateByGuid(detail,tbAttResStagChar);
if (i>0){
+// if (!edit) {
+// tbAttResBaseService.updateFinalState(tbAttResStagChar.getResGuid(), 0);
+// }
return true;
}
return false;
@@ -63,6 +75,11 @@
*/
@Override
public boolean auditByGuid(TbAttResStagChar tbAttResStagChar) {
+ boolean edit = false;
+ // 编辑标记
+ if (tbAttResStagChar.getCheckState()==4){
+ edit = true;
+ }
// 查询是否存在
TbAttResStagChar detail = baseMapper.getDetailByResGuid(tbAttResStagChar.getResGuid());
// 更新操作日志
@@ -72,13 +89,19 @@
if (null!=detail){
tbAttResStagChar.setGuid(detail.getGuid());
}
+
// 驳回情况下将状态修改回0即已填写未提交状态
if (tbAttResStagChar.getCheckState()==3){
- tbAttResStagChar.setCheckState(0);
+ detail.setCheckState(0);
+ } else {
+ detail.setCheckState(tbAttResStagChar.getCheckState());
}
// 更新数据
- int i = baseMapper.updateById(tbAttResStagChar);
+ int i = baseMapper.updateById(detail);
if (i>0){
+ if (!edit) {
+ tbAttResBaseService.updateFinalState(tbAttResStagChar.getResGuid(), tbAttResStagChar.getCheckState());
+ }
return true;
}
return false;
@@ -92,8 +115,10 @@
private int addOrUpdateByGuid(TbAttResStagChar oldAbAttResBase,TbAttResStagChar tbAttResStagChar){
int i = 0;
if (null!=oldAbAttResBase){
+ tbAttResStagChar.setGuid(oldAbAttResBase.getGuid());
// 更新
i = baseMapper.updateById(tbAttResStagChar);
+ tbAttResBaseService.updateFinalState(tbAttResStagChar.getResGuid(),tbAttResStagChar.getCheckState());
}else {
tbAttResStagChar.setCreateTime(new Date());
i = baseMapper.insert(tbAttResStagChar);
@@ -132,12 +157,12 @@
// 判断是否存在
if (null==oldAbAttResBase){
// 填报
- newTbAttResStagChar.setCheckLog(builder.toString());
+ oldAbAttResBase.setCheckLog(builder.toString());
}else {
StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
stringBuilder.append(builder);
// 填报
- newTbAttResStagChar.setCheckLog(stringBuilder.toString());
+ oldAbAttResBase.setCheckLog(stringBuilder.toString());
}
}
@@ -162,6 +187,7 @@
}
if (newTbAttResStagChar.getCheckState()==4){
fillName = "编辑";
+ oldAbAttResBase.setCheckState(oldAbAttResBase.getCheckState());
newTbAttResStagChar.setCheckState(oldAbAttResBase.getCheckState());
}
@@ -186,6 +212,7 @@
StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
stringBuilder.append(builder);
// 填报
+ oldAbAttResBase.setLog(stringBuilder.toString());
newTbAttResStagChar.setLog(stringBuilder.toString());
}
}
--
Gitblit v1.9.3