From a4cd27af8c445e2b043aa146ee38f04222c992e7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sun, 31 Mar 2024 15:24:21 +0800
Subject: [PATCH] 人工上报
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
index 64d4933..c451bd9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
@@ -119,6 +119,7 @@
if (null!=tbAttResBase.getGuid()){
// 更新
i = baseMapper.updateById(tbAttResBase);
+ updateFinalState(tbAttResBase.getGuid(),tbAttResBase.getCheckState());
}else {
tbAttResBase.setCreateTime(new Date());
i = baseMapper.insert(tbAttResBase);
@@ -258,7 +259,8 @@
tbAttResSafetyMonitor,
tbAttResStagChar,
tbAttResWaterBlock,
- tbAttResWaterDelivery).get();
+ tbAttResWaterDelivery
+ ).get();
// 数据处理
list.addAll(tbAttResBaseInfo.get());
list.addAll(tbAttResEngBene.get());
@@ -327,13 +329,21 @@
public Boolean updateFinalState(String resGuid, int state) {
TbAttResBase tbAttResBase = new TbAttResBase();
tbAttResBase.setGuid(resGuid);
- if (state==2){
+ if (state==1 || state==2){
// 审核通过，判断是否已全部通过审核
Boolean flag = baseMapper.getFinalCheckStateByGuid(resGuid);
if (flag){
tbAttResBase.setFinalState(1);
}else {
- tbAttResBase.setFinalState(0);
+ // 否则判断是否审核中
+ flag = baseMapper.getFinalCheckStateCheckLoadingByGuid(resGuid);
+ if (flag){
+ // 设置为审核中
+ tbAttResBase.setFinalState(2);
+ }else {
+ // 填写中
+ tbAttResBase.setFinalState(0);
+ }
}
}else {
tbAttResBase.setFinalState(0);
@@ -341,4 +351,26 @@
//更新
return updateById(tbAttResBase);
}
+
+ @Override
+ public void initTbData() {
+ initTbAttResBase();
+
+ initTbAttResStagChar();
+ }
+
+ /**
+ * 初始化填报水文特征表
+ */
+ private Integer initTbAttResStagChar() {
+ return baseMapper.initTbAttResStagChar();
+ }
+
+ /**
+ * 初始化水库基础信息填报表
+ */
+ private Integer initTbAttResBase() {
+ Integer i = baseMapper.initTbAttResBase();
+ return i;
+ }
}
--
Gitblit v1.9.3