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/TbAttResWaterDeliveryServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
index 49873c3..0624462 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
@@ -1,5 +1,6 @@
package cn.gistack.sm.sjztmd.service.impl;
+import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.mapper.TbAttResWaterDeliveryMapper;
@@ -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 TbAttResWaterDeliveryServiceImpl
@@ -64,9 +67,9 @@
// 创建或更新数据
boolean flag = addOrUpdate(oldList,newList);
if (flag){
- if (!edit) {
- tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
- }
+// if (!edit) {
+// tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
+// }
return true;
}
// 返回
@@ -97,10 +100,12 @@
if (addList.size()>0){
// 批量新增
addFlag = saveBatch(addList);
+ tbAttResBaseService.updateFinalState(addList.get(0).getResGuid(),addList.get(0).getCheckState());
}
if (updateList.size()>0){
// 批量更新
addFlag = updateBatchById(updateList);
+ tbAttResBaseService.updateFinalState(updateList.get(0).getResGuid(),updateList.get(0).getCheckState());
}
if (removeList.size()>0){
// 批量删除
@@ -131,8 +136,21 @@
setUpdateLog(oldList,newList);
// 更新审核日志
setUpdateCheckLog(oldList,newList);
+
+ // 取旧数据和新提交数据交集--更新
+ List<TbAttResWaterDelivery> updateList = Stream.concat(oldList.stream(),newList.stream())
+ .collect(Collectors.toMap(TbAttResWaterDelivery::getGuid, Function.identity(),(oldValue, newValue) -> {
+ oldValue.setCheckState(newValue.getCheckState());
+ return oldValue;
+ }
+ ))
+ .values()
+ .stream()
+ .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());
@@ -220,10 +238,8 @@
if (newTbAttResWaterDelivery.getCheckState()==4){
fillName = "编辑";
// 找到相关的 guid 数据
- for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
- if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
- newTbAttResWaterDelivery.setCheckState(tbAttResWaterDelivery.getCheckState());
- }
+ if (oldList.size()>0) {
+ newTbAttResWaterDelivery.setCheckState(oldList.get(0).getCheckState());
}
}
--
Gitblit v1.9.3