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/TbAttResSafetyMonitorServiceImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 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 09d9892..43be898 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
@@ -60,9 +60,9 @@
 		// 修改
 		int i = addOrUpdateByGuid(detail,tbAttResSafetyMonitor);
 		if (i>0){
-			if (!edit) {
-				tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(), 0);
-			}
+//			if (!edit) {
+//				tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(), 0);
+//			}
 			return true;
 		}
 		return false;
@@ -93,8 +93,10 @@
 		if (tbAttResSafetyMonitor.getCheckState()==3){
 			tbAttResSafetyMonitor.setCheckState(0);
 		}
+
+		detail.setCheckState(tbAttResSafetyMonitor.getCheckState());
 		// 更新数据
-		int i = baseMapper.updateById(tbAttResSafetyMonitor);
+		int i = baseMapper.updateById(detail);
 		if (i>0){
 			if (!edit) {
 				tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(), tbAttResSafetyMonitor.getCheckState());
@@ -115,6 +117,7 @@
 			tbAttResSafetyMonitor.setGuid(oldAbAttResBase.getGuid());
 			// 更新
 			i = baseMapper.updateById(tbAttResSafetyMonitor);
+			tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(),tbAttResSafetyMonitor.getCheckState());
 		}else {
 			tbAttResSafetyMonitor.setCreateTime(new Date());
 			i = baseMapper.insert(tbAttResSafetyMonitor);

--
Gitblit v1.9.3