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/TbAttResInformationProjectServiceImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResInformationProjectServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResInformationProjectServiceImpl.java
index ca67468..d7eb6ab 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResInformationProjectServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResInformationProjectServiceImpl.java
@@ -92,6 +92,7 @@
private int addOrUpdateByGuid(TbAttResInformationProject oldAbAttResBase,TbAttResInformationProject tbAttResInformationProject){
int i = 0;
if (null!=oldAbAttResBase){
+ tbAttResInformationProject.setGuid(oldAbAttResBase.getGuid());
// 更新
i = baseMapper.updateById(tbAttResInformationProject);
}else {
@@ -113,7 +114,7 @@
fillName = "审核";
}
if (newTbAttResInformationProject.getCheckState()==3){
- fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
+// fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
}
// 拼接
@@ -132,12 +133,12 @@
// 判断是否存在
if (null==oldAbAttResBase){
// 填报
- newTbAttResInformationProject.setCheckLog(builder.toString());
+// newTbAttResInformationProject.setCheckLog(builder.toString());
}else {
- StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
- stringBuilder.append(builder);
+// StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
+// stringBuilder.append(builder);
// 填报
- newTbAttResInformationProject.setCheckLog(stringBuilder.toString());
+// newTbAttResInformationProject.setCheckLog(stringBuilder.toString());
}
}
@@ -158,7 +159,12 @@
fillName = "审核";
}
if (newTbAttResInformationProject.getCheckState()==3){
- fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
+// fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
+ }
+ // 管理员编辑
+ if (newTbAttResInformationProject.getCheckState()==4){
+ fillName = "编辑";
+ newTbAttResInformationProject.setCheckState(oldAbAttResBase.getCheckState());
}
// 拼接
@@ -177,12 +183,12 @@
// 判断是否存在
if (null==oldAbAttResBase){
// 填报
- newTbAttResInformationProject.setLog(builder.toString());
+// newTbAttResInformationProject.setLog(builder.toString());
}else {
- StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
- stringBuilder.append(builder);
+// StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
+// stringBuilder.append(builder);
// 填报
- newTbAttResInformationProject.setLog(stringBuilder.toString());
+// newTbAttResInformationProject.setLog(stringBuilder.toString());
}
}
}
--
Gitblit v1.9.3