From a196fc3cf85ac2bb993a4d185ae9c3a255e9fa6a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 28 Nov 2023 15:20:48 +0800
Subject: [PATCH] 水库填报修复
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
index d8ab829..caf9237 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
@@ -136,8 +136,13 @@
setUpdateLog(oldList,newList);
// 更新审核日志
setUpdateCheckLog(oldList,newList);
+
+ // 取旧数据和新提交数据交集--更新
+ List<TbAttResPowerStation> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
+ e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+
// 更新数据
- boolean batch = updateBatchById(newList);
+ boolean batch = updateBatchById(updateList);
if (batch){
if (!edit) {
tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), newList.get(0).getCheckState());
--
Gitblit v1.9.3