From e143a763c75da7cc020bf19259256c8155b5da96 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
index caf020e..bc02ea6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
@@ -2,6 +2,9 @@
import cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO;
import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.sjztmd.vo.AttResAdVO;
+import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
+import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
import cn.gistack.sm.sjztmd.vo.ManagePersonVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,6 +23,8 @@
List<AttResBase> selectAttResBasePage(IPage<AttResBase> page, @Param("attResBase") AttResBase attResBase);
+ List<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, @Param("attResBase") AttResBaseGeneralInvestigationVO attResBase);
+
List<AttResBase> getListByRegion(IPage<AttResBase> page,@Param("obj") Map<String, Object> obj);
AttResBase getDetailByCode(@Param("code") String code);
@@ -27,12 +32,12 @@
/**
* 获取水库对应责任人分页数据
* @param params 条件查询参数对象
- * @param ad_code 行政区like条件
+// * @param ad_code 行政区like条件
+// * @param adGrad 级别
* @param page 分页查询参数对象
* @return
*/
List<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,
- @Param("ad_code") String ad_code,
@Param("params") Map<String, Object> params);
/**
@@ -44,4 +49,25 @@
Boolean updateResBaseByGuid(@Param("attResBase") AttResBase attResBase);
+ /**
+ * 查询当前水库对应的市级编号和县区编号
+ * @param res_cd
+ * @return
+ */
+ AttResBaseVO getCityCountyCodeByResGuid(@Param("guid") String res_cd);
+
+ /**
+ * 根据水库编码获取行政区数据
+ * @param guid
+ * @return
+ */
+ AttResAdVO getWaterRegionInfoByResGuid(@Param("guid") String guid);
+
+ /**
+ * 获取水库基本信息表DimResInfo总数
+ * @return
+ */
+ int getDimResInfoACount();
+
+ Boolean updateIsShowStatus(@Param("ids") String ids, @Param("isShow") Integer status);
}
--
Gitblit v1.9.3