From ea5a71d924e0163f2fb7cae00fc390b5068c050b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 31 Oct 2023 10:10:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java
index 4753b08..d6dbdbd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java
@@ -1,8 +1,13 @@
package cn.gistack.sm.sjztmd.mapper;
import cn.gistack.sm.sjztmd.entity.TbAttResBase;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
/**
@@ -21,4 +26,44 @@
int updateByGuid(@Param("tbAttResBase") TbAttResBase tbAttResBase);
+
+ /**
+ * 查询水库基础填报数据
+ * @param resGuid
+ * @param tableName
+ * @return
+ */
+ @DS("zt")
+ List<Map<String, Object>> getTbAttResBaseInfo(@Param("resGuid") String resGuid,@Param("tableName") String tableName);
+
+ /**
+ * 查询水库其他填报数据
+ * @param resGuid
+ * @param tableName
+ * @return
+ */
+ @DS("zt")
+ @InterceptorIgnore(tenantLine = "true")
+ List<Map<String, Object>> getTbInfo(@Param("resGuid") String resGuid,
+ @Param("tableNameColumn") String tableNameColumn,
+ @Param("tableName") String tableName);
+
+ /**
+ * 查询水库基本详情，水位特征，挡水，输水，泄洪建筑物，电站，水库效益，工程运用，管理体制，安全鉴定和除险加固，信息化建设，文件夹存储位置所有状态的一个总状态
+ * 规则：1.一个未填写则标记总状态为未填写 2. 只要一个填写了就标记为已填写中 3.只有所有的都审核通过了才标记为完成
+ * @param guid 水库guid
+ * @return
+ */
+ @DS("zt")
+ @InterceptorIgnore(tenantLine = "true")
+ Boolean getFinalCheckStateByGuid(@Param("guid")String guid);
+
+ /**
+ * 否则判断是否审核中
+ * @param resGuid
+ * @return
+ */
+ @DS("zt")
+ @InterceptorIgnore(tenantLine = "true")
+ Boolean getFinalCheckStateCheckLoadingByGuid(@Param("guid") String resGuid);
}
--
Gitblit v1.9.3