From ae37e30dcf71113f69d11fbe7cfef389a1fb9a01 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 28 Nov 2023 17:36:10 +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/TbAttResProjectUtilizeServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java
index 1a4c954..1061db6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java
@@ -60,9 +60,9 @@
// 修改
int i = addOrUpdateByGuid(detail,tbAttResProjectUtilize);
if (i>0){
- if (!edit) {
- tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(), 0);
- }
+// if (!edit) {
+// tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(), 0);
+// }
return true;
}
return false;
@@ -93,8 +93,11 @@
if (tbAttResProjectUtilize.getCheckState()==3){
tbAttResProjectUtilize.setCheckState(0);
}
+
+ detail.setCheckState(tbAttResProjectUtilize.getCheckState());
+
// 更新数据
- int i = baseMapper.updateById(tbAttResProjectUtilize);
+ int i = baseMapper.updateById(detail);
if (i>0){
if (!edit) {
tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(), tbAttResProjectUtilize.getCheckState());
@@ -115,6 +118,7 @@
tbAttResProjectUtilize.setGuid(oldAbAttResBase.getGuid());
// 更新
i = baseMapper.updateById(tbAttResProjectUtilize);
+ tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(),tbAttResProjectUtilize.getCheckState());
}else {
tbAttResProjectUtilize.setCreateTime(new Date());
i = baseMapper.insert(tbAttResProjectUtilize);
--
Gitblit v1.9.3