From ae37e30dcf71113f69d11fbe7cfef389a1fb9a01 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 28 Nov 2023 17:36:10 +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/TbAttResSafetyMonitorServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java
index 2c84a96..43be898 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResSafetyMonitorServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.sjztmd.entity.TbAttResSafetyMonitor;
import cn.gistack.sm.sjztmd.mapper.TbAttResSafetyMonitorMapper;
+import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResSafetyMonitorService;
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(TbAttResSafetyMonitor tbAttResSafetyMonitor) {
+ boolean edit = false;
+ // 编辑标记
+ if (tbAttResSafetyMonitor.getCheckState()==4){
+ edit = true;
+ }
// 查询是否存在
TbAttResSafetyMonitor detail = baseMapper.getDetailByResGuid(tbAttResSafetyMonitor.getResGuid());
// 更新日志
@@ -51,6 +60,9 @@
// 修改
int i = addOrUpdateByGuid(detail,tbAttResSafetyMonitor);
if (i>0){
+// if (!edit) {
+// tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(), 0);
+// }
return true;
}
return false;
@@ -63,6 +75,11 @@
*/
@Override
public boolean auditByGuid(TbAttResSafetyMonitor tbAttResSafetyMonitor) {
+ boolean edit = false;
+ // 编辑标记
+ if (tbAttResSafetyMonitor.getCheckState()==4){
+ edit = true;
+ }
// 查询是否存在
TbAttResSafetyMonitor detail = baseMapper.getDetailByResGuid(tbAttResSafetyMonitor.getResGuid());
// 更新操作日志
@@ -76,9 +93,14 @@
if (tbAttResSafetyMonitor.getCheckState()==3){
tbAttResSafetyMonitor.setCheckState(0);
}
+
+ detail.setCheckState(tbAttResSafetyMonitor.getCheckState());
// 更新数据
- int i = baseMapper.updateById(tbAttResSafetyMonitor);
+ int i = baseMapper.updateById(detail);
if (i>0){
+ if (!edit) {
+ tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(), tbAttResSafetyMonitor.getCheckState());
+ }
return true;
}
return false;
@@ -92,8 +114,10 @@
private int addOrUpdateByGuid(TbAttResSafetyMonitor oldAbAttResBase,TbAttResSafetyMonitor tbAttResSafetyMonitor){
int i = 0;
if (null!=oldAbAttResBase){
+ tbAttResSafetyMonitor.setGuid(oldAbAttResBase.getGuid());
// 更新
i = baseMapper.updateById(tbAttResSafetyMonitor);
+ tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(),tbAttResSafetyMonitor.getCheckState());
}else {
tbAttResSafetyMonitor.setCreateTime(new Date());
i = baseMapper.insert(tbAttResSafetyMonitor);
@@ -160,6 +184,10 @@
if (newTbAttResSafetyMonitor.getCheckState()==3){
fillName = "退回" + (null==newTbAttResSafetyMonitor.getCheckLog()?"":":" + newTbAttResSafetyMonitor.getCheckLog());
}
+ if (newTbAttResSafetyMonitor.getCheckState()==4){
+ fillName = "编辑";
+ newTbAttResSafetyMonitor.setCheckState(oldAbAttResBase.getCheckState());
+ }
// 拼接
String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());
--
Gitblit v1.9.3