From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java | 14 ++++++++++++--
1 files changed, 12 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 4343bb6..b2174e1 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,7 @@
import cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO;
import cn.gistack.sm.sjztmd.entity.AttResBase;
+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;
@@ -27,12 +28,12 @@
/**
* 获取水库对应责任人分页数据
* @param params 条件查询参数对象
- * @param list 行政区code集合
+// * @param ad_code 行政区like条件
+// * @param adGrad 级别
* @param page 分页查询参数对象
* @return
*/
List<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,
- @Param("list") List<String> list,
@Param("params") Map<String, Object> params);
/**
@@ -41,4 +42,13 @@
* @return
*/
List<ManagePersonVO> getUserByResBaseGuid(@Param("guid") String guid);
+
+ Boolean updateResBaseByGuid(@Param("attResBase") AttResBase attResBase);
+
+ /**
+ * 查询当前水库对应的市级编号和县区编号
+ * @param res_cd
+ * @return
+ */
+ AttResBaseVO getCityCountyCodeByResGuid(@Param("guid") String res_cd);
}
--
Gitblit v1.9.3