From a5264ae79165ac3db0878896f7995c7c92259ecb Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 08 Sep 2023 09:33:29 +0800
Subject: [PATCH] 多站填报状态赋值修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java | 6 ++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java | 6 ++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java | 7 +++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java | 6 ++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java | 6 ++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java | 6 ++----
6 files changed, 13 insertions(+), 24 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 fd363f0..98cd7a9 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
@@ -97,6 +97,7 @@
boolean updateFlag = true;
boolean removeFlag = true;
if (addList.size()>0){
+ //如果是中途管理员编辑新增了一个，将状态设置为和原有的状态一致
// 批量新增
addFlag = saveBatch(addList);
}
@@ -222,10 +223,8 @@
if (newTbAttResPowerStation.getCheckState()==4){
fillName = "编辑";
// 找到相关的 guid 数据
- for (TbAttResPowerStation tbAttResPowerStation : oldList) {
- if (tbAttResPowerStation.getGuid().equals(newTbAttResPowerStation.getGuid())){
- newTbAttResPowerStation.setCheckState(tbAttResPowerStation.getCheckState());
- }
+ if (oldList.size()>0) {
+ newTbAttResPowerStation.setCheckState(oldList.get(0).getCheckState());
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
index 7a5f1d2..4e17cec 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
@@ -238,10 +238,8 @@
if (newTbAttResRsbNorspi.getCheckState()==4){
fillName = "编辑";
// 找到相关的 guid 数据
- for (TbAttResRsbNorspi tbAttResRsbNorspi : oldList) {
- if (tbAttResRsbNorspi.getGuid().equals(newTbAttResRsbNorspi.getGuid())){
- newTbAttResRsbNorspi.setCheckState(tbAttResRsbNorspi.getCheckState());
- }
+ if (oldList.size()>0) {
+ newTbAttResRsbNorspi.setCheckState(oldList.get(0).getCheckState());
}
}
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 a823627..a4c3609 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
@@ -219,10 +219,8 @@
if (newTbAttResRsbSpillway.getCheckState()==4){
fillName = "编辑";
// 找到相关的 guid 数据
- for (TbAttResRsbSpillway tbAttResRsbSpillway : oldList) {
- if (tbAttResRsbSpillway.getGuid().equals(newTbAttResRsbSpillway.getGuid())){
- newTbAttResRsbSpillway.setCheckState(tbAttResRsbSpillway.getCheckState());
- }
+ if (oldList.size()>0){
+ newTbAttResRsbSpillway.setCheckState(oldList.get(0).getCheckState());
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java
index 6ed5084..7ee2a54 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java
@@ -220,10 +220,8 @@
if (newTbAttResRsbVerspi.getCheckState()==4){
fillName = "编辑";
// 找到相关的 guid 数据
- for (TbAttResRsbVerspi tbAttResRsbVerspi : oldList) {
- if (tbAttResRsbVerspi.getGuid().equals(newTbAttResRsbVerspi.getGuid())){
- newTbAttResRsbVerspi.setCheckState(tbAttResRsbVerspi.getCheckState());
- }
+ if (oldList.size()>0){
+ newTbAttResRsbVerspi.setCheckState(oldList.get(0).getCheckState());
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java
index 1ff3e47..92432bb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterBlockServiceImpl.java
@@ -220,10 +220,8 @@
if (newTbAttResWaterBlock.getCheckState()==4){
fillName = "编辑";
// 找到相关的 guid 数据
- for (TbAttResWaterBlock tbAttResWaterBlock : oldList) {
- if (tbAttResWaterBlock.getGuid().equals(newTbAttResWaterBlock.getGuid())){
- newTbAttResWaterBlock.setCheckState(tbAttResWaterBlock.getCheckState());
- }
+ if (oldList.size()>0){
+ newTbAttResWaterBlock.setCheckState(oldList.get(0).getCheckState());
}
}
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..f167f81 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
@@ -220,10 +220,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