From a331dacaa853a79efb78937dd49e5f6cca22ba69 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 11 Jan 2024 11:49:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
index f239444..3f8005e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -5,6 +5,9 @@
import cn.gistack.sm.sjztmd.entity.AttResBase;
import cn.gistack.sm.sjztmd.mapper.AttResBaseMapper;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
+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.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,6 +41,11 @@
}
@Override
+ public IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) {
+ return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase));
+ }
+
+ @Override
public IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj) {
return page.setRecords(baseMapper.getListByRegion(page,obj));
}
@@ -56,23 +64,12 @@
@Override
public Object getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
- Object adCode = params.get("adCode");
- String ad_code = "";
- String code = adCode.toString();
- if (code.substring(0,4).indexOf("00") > -1) {
- ad_code = adCode.toString().substring(0,2);
- } else if (code.substring(0,6).indexOf("00") > -1) {
- ad_code = adCode.toString().substring(0,4);
- } else {
- ad_code = adCode.toString().substring(0,6);
- }
Object isExport = params.get("isExport");
-
// 判断是否导出，导出不分页
if (null != isExport && !isExport.equals("")) {
- return baseMapper.getAttResBaseUserPage(null,ad_code,params);
+ return baseMapper.getAttResBaseUserPage(null,params);
}
- List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,ad_code,params);
+ List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,params);
// 返回数据
return page.setRecords(attResBaseUserDTOList);
}
@@ -82,4 +79,29 @@
attResBase.setUpdateTime(DateUtil.now());
return baseMapper.updateResBaseByGuid(attResBase);
}
+
+ /**
+ * 查询当前水库对应的市级编号和县区编号
+ * @param res_cd
+ * @return
+ */
+ @Override
+ public AttResBaseVO getCityCountyCodeByResGuid(String res_cd) {
+ return baseMapper.getCityCountyCodeByResGuid(res_cd);
+ }
+
+ /**
+ * 根据水库编码获取行政区数据
+ * @param guid
+ * @return
+ */
+ @Override
+ public AttResAdVO getWaterRegionInfoByResGuid(String guid) {
+ return baseMapper.getWaterRegionInfoByResGuid(guid);
+ }
+
+ @Override
+ public int getDimResInfoACount() {
+ return baseMapper.getDimResInfoACount();
+ }
}
--
Gitblit v1.9.3