From b6a42ed2c7bb93651a9a026afb3ee83449ed8256 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 11 Sep 2023 09:29: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/TbAttResRsbNorspiServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
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 a12eb22..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
@@ -6,6 +6,7 @@
import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbNorspiMapper;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbVerspiMapper;
+import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbNorspiService;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbSpillwayService;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbVerspiService;
@@ -48,6 +49,9 @@
@Autowired
private ITbAttResRsbSpillwayService tbAttResRsbSpillwayService;
+ @Autowired
+ private ITbAttResBaseService tbAttResBaseService;
+
/**
* 查询水库填报详情信息
* @param guid
@@ -65,6 +69,11 @@
*/
@Override
public boolean updateByGuid(List<TbAttResRsbNorspi> newList) {
+ boolean edit = false;
+ // 编辑标记
+ if (newList.get(0).getCheckState()==4){
+ edit = true;
+ }
String resGuid = newList.get(0).getResGuid();
// 查询是否存在
List<TbAttResRsbNorspi> oldList = baseMapper.getDetailByResGuid(resGuid);
@@ -72,8 +81,14 @@
setUpdateLog(oldList,newList);
// 创建或更新数据
boolean flag = addOrUpdate(oldList,newList);
+ if (flag){
+ if (!edit) {
+ tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
+ }
+ return true;
+ }
// 返回
- return flag;
+ return false;
}
/**
@@ -123,6 +138,11 @@
*/
@Override
public boolean auditByGuid(List<TbAttResRsbNorspi> newList) {
+ boolean edit = false;
+ // 编辑标记
+ if (newList.get(0).getCheckState()==4){
+ edit = true;
+ }
// 查询是否存在
List<TbAttResRsbNorspi> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
// 更新操作日志
@@ -131,6 +151,12 @@
setUpdateCheckLog(oldList,newList);
// 更新数据
boolean batch = updateBatchById(newList);
+ if (batch){
+ if (!edit) {
+ tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), newList.get(0).getCheckState());
+ }
+ return true;
+ }
// 返回
return batch;
}
@@ -212,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());
}
}
--
Gitblit v1.9.3