From b7d5b529707e5bd98ec334c1be4b13c21e69f6e6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 22 Aug 2023 17:56:14 +0800
Subject: [PATCH] 水库填报修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java
index 2c84a96..8596a52 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java
@@ -92,6 +92,7 @@
private int addOrUpdateByGuid(TbAttResSafetyMonitor oldAbAttResBase,TbAttResSafetyMonitor tbAttResSafetyMonitor){
int i = 0;
if (null!=oldAbAttResBase){
+ tbAttResSafetyMonitor.setGuid(oldAbAttResBase.getGuid());
// 更新
i = baseMapper.updateById(tbAttResSafetyMonitor);
}else {
@@ -160,6 +161,10 @@
if (newTbAttResSafetyMonitor.getCheckState()==3){
fillName = "退回" + (null==newTbAttResSafetyMonitor.getCheckLog()?"":":" + newTbAttResSafetyMonitor.getCheckLog());
}
+ if (newTbAttResSafetyMonitor.getCheckState()==4){
+ fillName = "编辑";
+ newTbAttResSafetyMonitor.setCheckState(oldAbAttResBase.getCheckState());
+ }
// 拼接
String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
--
Gitblit v1.9.3