From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +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/TbAttResEngBeneServiceImpl.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java
index 80d9129..2af05bd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResEngBeneServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.sjztmd.entity.TbAttResEngBene;
import cn.gistack.sm.sjztmd.mapper.TbAttResEngBeneMapper;
+import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResEngBeneService;
import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -27,6 +28,9 @@
@Autowired
private IUserClient userClient;
+ @Autowired
+ private ITbAttResBaseService tbAttResBaseService;
+
/**
* 查询水库填报详情信息
* @param guid
@@ -44,6 +48,11 @@
*/
@Override
public boolean updateByGuid(TbAttResEngBene tbAttResEngBene) {
+ boolean edit = false;
+ // 编辑标记
+ if (tbAttResEngBene.getCheckState()==4){
+ edit = true;
+ }
// 查询是否存在
TbAttResEngBene detail = baseMapper.getDetailByResGuid(tbAttResEngBene.getResGuid());
// 更新日志
@@ -51,6 +60,9 @@
// 修改
int i = addOrUpdateByGuid(detail,tbAttResEngBene);
if (i>0){
+ if (!edit) {
+ tbAttResBaseService.updateFinalState(tbAttResEngBene.getResGuid(), 0);
+ }
return true;
}
return false;
@@ -63,6 +75,11 @@
*/
@Override
public boolean auditByGuid(TbAttResEngBene tbAttResEngBene) {
+ boolean edit = false;
+ // 编辑标记
+ if (tbAttResEngBene.getCheckState()==4){
+ edit = true;
+ }
// 查询是否存在
TbAttResEngBene detail = baseMapper.getDetailByResGuid(tbAttResEngBene.getResGuid());
// 更新操作日志
@@ -79,6 +96,9 @@
// 更新数据
int i = baseMapper.updateById(tbAttResEngBene);
if (i>0){
+ if (!edit) {
+ tbAttResBaseService.updateFinalState(tbAttResEngBene.getResGuid(), tbAttResEngBene.getCheckState());
+ }
return true;
}
return false;
@@ -92,6 +112,7 @@
private int addOrUpdateByGuid(TbAttResEngBene oldAbAttResBase,TbAttResEngBene tbAttResEngBene){
int i = 0;
if (null!=oldAbAttResBase){
+ tbAttResEngBene.setGuid(oldAbAttResBase.getGuid());
// 更新
i = baseMapper.updateById(tbAttResEngBene);
}else {
@@ -160,6 +181,11 @@
if (newTbAttResEngBene.getCheckState()==3){
fillName = "退回" + (null==newTbAttResEngBene.getCheckLog()?"":":" + newTbAttResEngBene.getCheckLog());
}
+ // 管理员编辑
+ if (newTbAttResEngBene.getCheckState()==4){
+ fillName = "编辑";
+ newTbAttResEngBene.setCheckState(oldAbAttResBase.getCheckState());
+ }
// 拼接
String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
--
Gitblit v1.9.3