From 408406dff8f428e1439dbf909bc4f5d317cdaf5b Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 19 Jun 2024 16:27:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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..b2dd909 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
@@ -3,12 +3,12 @@
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.vo.AttAdBaseVO;
-import cn.gistack.sm.sjztmd.vo.AttResAdVO;
-import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
+import cn.gistack.sm.sjztmd.excel.AttResBaseUserExcel;
+import cn.gistack.sm.sjztmd.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -23,7 +23,9 @@
IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase);
- IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj);
+ Object selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase);
+
+ IPage<AttResBaseVO> getListByRegion(IPage<AttResBaseVO> page,Map<String, Object> obj);
AttResBase getDetailByCode(String code);
@@ -50,4 +52,31 @@
* @return
*/
AttResAdVO getWaterRegionInfoByResGuid(String guid);
+
+ int getDimResInfoACount();
+
+ Boolean updateIsShowStatus(String ids, Integer status);
+
+ /**
+ * 根据水库名称、所在区域查询改水库的数量
+ * @param resName 水库名称
+ * @param countyName 区县
+ * @return
+ */
+ Integer getWaterCountByResNameAndCountyName(String resName, String countyName);
+
+ /**
+ * 获取水库的行政区划以及行政区划等级
+ * @param resId
+ * @return
+ */
+ AttResAdVO getResAd(String resId);
+
+ AttAdBase getYwxtResInfo(String cityName, String countyName);
+
+ List<AttResBaseUserExcel> exportAttResBaseUser(Map<String, Object> params);
+
+ List<AttResWithRainfall> getAttResByRainfall(String minRainfall, String maxRainfall, String dayIndex) ;
+
+ int[] getAttResNumByRainfall(String dayIndex);
}
--
Gitblit v1.9.3