From fc2adc3521931c2f7bc5b2f3a3d94ebf407828d6 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 01 Jul 2024 09:40:55 +0800
Subject: [PATCH] 水库堤防白蚁普查资料当前页压缩导出新增条件优化v20240701
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 151 insertions(+), 4 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 46f7d6b..66c87de 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
@@ -10,6 +10,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -53,6 +54,10 @@
*/
@Override
public boolean updateByGuid(TbAttResBase tbAttResBase) {
+ // 设置填报数据表的最终填报状态
+ if (tbAttResBase.getCheckState()!=4) {
+ tbAttResBase.setFinalState(0);
+ }
// 查询是否存在
TbAttResBase detail = baseMapper.getDetailByGuid(tbAttResBase.getGuid());
// 更新审核日志
@@ -84,10 +89,22 @@
// 驳回情况下将状态修改回0即已填写未提交状态
if (tbAttResBase.getCheckState()==3){
tbAttResBase.setCheckState(0);
+ // 只要一个退回则设置为填写中...
+ tbAttResBase.setFinalState(0);
}
// 更新数据
int i = baseMapper.updateById(tbAttResBase);
if (i>0){
+ // 如果是审核通过需要判断其他报表是否都已填报并审核通过
+ if (tbAttResBase.getCheckState()==2){
+ Boolean flag = baseMapper.getFinalCheckStateByGuid(tbAttResBase.getGuid());
+ if (flag){
+ TbAttResBase tbAttResBase1 = new TbAttResBase();
+ tbAttResBase1.setFinalState(1);
+ tbAttResBase1.setGuid(tbAttResBase.getGuid());
+ updateById(tbAttResBase1);
+ }
+ }
return true;
}
return false;
@@ -103,6 +120,7 @@
if (null!=tbAttResBase.getGuid()){
// 更新
i = baseMapper.updateById(tbAttResBase);
+ updateFinalState(tbAttResBase.getGuid(),tbAttResBase.getCheckState());
}else {
tbAttResBase.setCreateTime(new Date());
i = baseMapper.insert(tbAttResBase);
@@ -212,7 +230,7 @@
// 查询水库基础填报数据
CompletableFuture<List<Map<String,Object>>> tbAttResBaseInfo = getTbAttResBaseInfo("tb_att_res_base",resGuid, executor);
// 查询水库其他填报数据
- CompletableFuture<List<Map<String,Object>>> tbAttResBuildInfo = getTbInfo("tb_att_res_build_info",resGuid,executor);
+// CompletableFuture<List<Map<String,Object>>> tbAttResBuildInfo = getTbInfo("tb_att_res_build_info",resGuid,executor);
CompletableFuture<List<Map<String,Object>>> tbAttResEngBene = getTbInfo("tb_att_res_eng_bene",resGuid,executor);
CompletableFuture<List<Map<String,Object>>> tbAttResInfomationProject = getTbInfo("tb_att_res_infomation_project",resGuid,executor);
CompletableFuture<List<Map<String,Object>>> tbAttResMgrSysB = getTbInfo("tb_att_res_mgr_sys_b",resGuid,executor);
@@ -225,11 +243,12 @@
CompletableFuture<List<Map<String,Object>>> tbAttResStagChar = getTbInfo("tb_att_res_stag_char",resGuid,executor);
CompletableFuture<List<Map<String,Object>>> tbAttResWaterBlock = getTbInfo("tb_att_res_water_block",resGuid,executor);
CompletableFuture<List<Map<String,Object>>> tbAttResWaterDelivery = getTbInfo("tb_att_res_water_delivery",resGuid,executor);
+ CompletableFuture<List<Map<String,Object>>> tbFileStorageLocation = getTbInfo("tb_file_storage_location",resGuid,executor);
//等待所有任务执行完成
try {
CompletableFuture.allOf(
tbAttResBaseInfo,
- tbAttResBuildInfo,
+ tbFileStorageLocation,
tbAttResEngBene,
tbAttResInfomationProject,
tbAttResMgrSysB,
@@ -241,10 +260,10 @@
tbAttResSafetyMonitor,
tbAttResStagChar,
tbAttResWaterBlock,
- tbAttResWaterDelivery).get();
+ tbAttResWaterDelivery
+ ).get();
// 数据处理
list.addAll(tbAttResBaseInfo.get());
- list.addAll(tbAttResBuildInfo.get());
list.addAll(tbAttResEngBene.get());
list.addAll(tbAttResInfomationProject.get());
list.addAll(tbAttResMgrSysB.get());
@@ -257,6 +276,7 @@
list.addAll(tbAttResStagChar.get());
list.addAll(tbAttResWaterBlock.get());
list.addAll(tbAttResWaterDelivery.get());
+ list.addAll(tbFileStorageLocation.get());
} catch (InterruptedException e) {
e.printStackTrace();
} catch (ExecutionException e) {
@@ -300,4 +320,131 @@
return tbInfo;
},executor);
}
+
+ /**
+ * 更新水库信息填报最终状态
+ * @param resGuid 水库编码
+ * @param state 状态值
+ */
+ @Override
+ public Boolean updateFinalState(String resGuid, int state) {
+ TbAttResBase tbAttResBase = new TbAttResBase();
+ tbAttResBase.setGuid(resGuid);
+ if (state==1 || state==2){
+ // 审核通过，判断是否已全部通过审核
+ Boolean flag = baseMapper.getFinalCheckStateByGuid(resGuid);
+ if (flag){
+ tbAttResBase.setFinalState(1);
+ }else {
+ // 否则判断是否审核中
+ flag = baseMapper.getFinalCheckStateCheckLoadingByGuid(resGuid);
+ if (flag){
+ // 设置为审核中
+ tbAttResBase.setFinalState(2);
+ }else {
+ // 填写中
+ tbAttResBase.setFinalState(0);
+ }
+ }
+ }else {
+ tbAttResBase.setFinalState(0);
+ }
+ //更新
+ return updateById(tbAttResBase);
+ }
+
+ @Override
+ public String initTbData() {
+ //初始化基础信心
+ Integer tbAttresBase = initTbAttResBase();
+
+ //初始化水文特征
+ Integer tbAttResStagChar = initTbAttResStagChar();
+
+ //初始化挡水建筑物
+ Integer tbAttResWaterBlock= initTbAttResWaterBlock();
+
+ //初始化正常溢洪道
+ Integer tbAttResRsbNorspi= initTbAttResRsbNorspi();
+
+ //初始化泄洪洞
+ Integer tbAttResRsbSpillway= initTbAttResRsbSpillway();
+
+ //初始化非常溢洪道
+ Integer tbAttResRsbVerspi=initTbAttResRsbVerspi();
+
+ //初始化输水建筑物
+ Integer tbAttResWaterDelivery=initTbAttResWaterDelivery();
+
+ //初始化电站
+ Integer tbAttResPowerStation=initTbAttResPowerStation();
+
+ //初始化管理体制
+ Integer tbAttResMgrSysB=initTbAttResMgrSysB();
+
+ //初始化除险加固
+ Integer tbAttResSafetyMonitor=initTbAttResSafetyMonitor();
+
+ String message = StringUtil.format(
+ "基础信息更新数量为{}，" +
+ "水文特征更新数量为{}，" +
+ "挡水建筑物更新数量为{}，" +
+ "正常溢洪道更新数量为{}，" +
+ "泄洪洞更新数量为{}，" +
+ "非常溢洪道更新数量为{}，" +
+ "输水建筑物更新数量为{}，" +
+ "电站更新数量为{}，" +
+ "管理体制更新数量为{}，" +
+ "除险加固更新数量为{}",tbAttresBase,tbAttResStagChar,tbAttResWaterBlock,tbAttResRsbNorspi,tbAttResRsbSpillway,tbAttResRsbVerspi,tbAttResWaterDelivery,tbAttResPowerStation,tbAttResMgrSysB,tbAttResSafetyMonitor
+ );
+
+ return message;
+ }
+
+ private Integer initTbAttResSafetyMonitor() {
+ return baseMapper.initTbAttResSafetyMonitor();
+ }
+
+ private Integer initTbAttResMgrSysB() {
+ return baseMapper.initTbAttResMgrSysB();
+ }
+
+ private Integer initTbAttResPowerStation() {
+ return baseMapper.initTbAttResPowerStation();
+ }
+
+ private Integer initTbAttResWaterDelivery() {
+ return baseMapper.initTbAttResWaterDelivery();
+ }
+
+ private Integer initTbAttResRsbVerspi() {
+ return baseMapper.initTbAttResRsbVerspi();
+ }
+
+ private Integer initTbAttResRsbSpillway() {
+ return baseMapper.initTbAttResRsbSpillway();
+ }
+
+ private Integer initTbAttResRsbNorspi() {
+ return baseMapper.initTbAttResRsbNorspi();
+ }
+
+ private Integer initTbAttResWaterBlock() {
+ return baseMapper.initTbAttResWaterBlock();
+ }
+
+ /**
+ * 初始化填报水文特征表
+ */
+ private Integer initTbAttResStagChar() {
+ return baseMapper.initTbAttResStagChar();
+ }
+
+ /**
+ * 初始化水库基础信息填报表
+ */
+ private Integer initTbAttResBase() {
+ Integer i = baseMapper.initTbAttResBase();
+ return i;
+ }
}
--
Gitblit v1.9.3