From b6a42ed2c7bb93651a9a026afb3ee83449ed8256 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 11 Sep 2023 09:29:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResInformationProjectServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 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 038263b..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
@@ -114,7 +114,7 @@
fillName = "审核";
}
if (newTbAttResInformationProject.getCheckState()==3){
- fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
+// fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
}
// 拼接
@@ -133,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());
}
}
@@ -159,7 +159,7 @@
fillName = "审核";
}
if (newTbAttResInformationProject.getCheckState()==3){
- fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
+// fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
}
// 管理员编辑
if (newTbAttResInformationProject.getCheckState()==4){
@@ -183,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