From 0bdd1bda41e6fa8436d070b1f4e5b1f19f86d9d8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 27 Feb 2024 14:34:46 +0800
Subject: [PATCH] Merge branch 'jtdev' into 20240222-patrol

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
index 0576c30..6cee98b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
@@ -5,6 +5,7 @@
 import cn.gistack.sm.sjztmd.entity.AttResBase;
 import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
 import cn.gistack.sm.sjztmd.vo.AttResAdVO;
+import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
 import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -22,6 +23,8 @@
 public interface IAttResBaseService extends IService<AttResBase> {
 
     IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase);
+
+	IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase);
 
 	IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj);
 
@@ -50,4 +53,16 @@
 	 * @return
 	 */
 	AttResAdVO getWaterRegionInfoByResGuid(String guid);
+
+	int getDimResInfoACount();
+
+    Boolean updateIsShowStatus(String ids, Integer status);
+
+	/**
+	 * 根据水库名称、所在区域查询改水库的数量
+	 * @param resName 水库名称
+	 * @param countyName 区县
+	 * @return
+	 */
+	Integer getWaterCountByResNameAndCountyName(String resName, String countyName);
 }

--
Gitblit v1.9.3