From 5bb34860af3a025b136ebf023351bc4ce1e41a4f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 29 Nov 2023 17:56: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/TbAttResRsbSpillwayServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java
index 1f7021e..926accf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
+import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbSpillwayMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbSpillwayService;
@@ -16,7 +17,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @ClassName TbAttResRsbSpillwayServiceImpl
@@ -133,8 +136,19 @@
setUpdateLog(oldList,newList);
// 更新审核日志
setUpdateCheckLog(oldList,newList);
+
// 更新数据
- boolean batch = updateBatchById(newList);
+ List<TbAttResRsbSpillway> updateList = Stream.concat(oldList.stream(),newList.stream())
+ .collect(Collectors.toMap(TbAttResRsbSpillway::getGuid, Function.identity(),(oldValue, newValue) -> {
+ oldValue.setCheckState(newValue.getCheckState());
+ return oldValue;
+ }
+ ))
+ .values()
+ .stream()
+ .collect(Collectors.toList());
+
+ boolean batch = updateBatchById(updateList);
if (batch){
if (!edit) {
tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), newList.get(0).getCheckState());
--
Gitblit v1.9.3