From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 1 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 cf79edd..aacab16 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
@@ -1,10 +1,19 @@
 package cn.gistack.sm.sjztmd.mapper;
 
+import cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO;
+import cn.gistack.sm.sjztmd.entity.AttAdBase;
 import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.sjztmd.excel.AttResBaseUserExcel;
+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;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -13,12 +22,84 @@
  *
  * @author Chill
  */
+
+@Mapper
 public interface AttResBaseMapper extends BaseMapper<AttResBase> {
 
 
 	List<AttResBase> selectAttResBasePage(IPage<AttResBase> page, @Param("attResBase") AttResBase attResBase);
 
-    List<AttResBase> getListByRegion(IPage<AttResBase> page,@Param("obj") Map<String, Object> obj);
+	List<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, @Param("attResBase")  AttResBaseGeneralInvestigationVO attResBase);
+
+    List<AttResBaseVO> getListByRegion(IPage<AttResBaseVO> page,@Param("obj") Map<String, Object> obj);
 
 	AttResBase getDetailByCode(@Param("code") String code);
+
+	/**
+	 * 获取水库对应责任人分页数据
+	 * @param params 条件查询参数对象
+//	 * @param ad_code 行政区like条件
+//	 * @param adGrad 级别
+	 * @param page 分页查询参数对象
+	 * @return
+	 */
+	List<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,
+												  @Param("params") Map<String, Object> params);
+
+
+	List<AttResBaseUserExcel> getAttResBaseUserExcel(@Param("params") Map<String, Object> params);
+
+	/**
+	 * 查询各类型责任人
+	 * @param guid 水库 guid
+	 * @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);
+
+	/**
+	 * 根据水库编码获取行政区数据
+	 * @param guid
+	 * @return
+	 */
+    AttResAdVO getWaterRegionInfoByResGuid(@Param("guid") String guid);
+
+	/**
+	 * 获取水库基本信息表DimResInfo总数
+	 * @return
+	 */
+	int getDimResInfoACount();
+
+    Boolean updateIsShowStatus(@Param("ids") String ids, @Param("isShow") Integer status);
+
+	/**
+	 * 根据水库名称、所在区域查询改水库的数量
+	 * @param resName 水库名称
+	 * @param countyCode 区县编号
+	 * @return
+	 */
+	Integer getWaterCountByResNameAndCountyName(@Param("resName") String resName,@Param("countyCode")  String countyCode);
+
+	AttResAdVO getResAd(@Param("resId") String resId);
+
+    AttAdBase getYwxtResInfo(@Param("cityName") String cityName,@Param("countyName") String countyName);
+
+	Boolean updateRsvr(@Param("attResBase") AttResBase attResBase);
+
+	/**
+	 * 获取操作记录
+	 * @param guid
+	 * @return
+	 */
+	String getUpdateLog(@Param("resGuid") String guid);
+
+	int updateRelResUpdateLoc(@Param("resGuid") String guid,@Param("updateLog") String updateLog);
 }

--
Gitblit v1.9.3