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 |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 15d9b86..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
@@ -6,6 +6,7 @@
 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;
@@ -37,6 +38,11 @@
 	@Override
 	public IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase) {
 		return page.setRecords(baseMapper.selectAttResBasePage(page,attResBase));
+	}
+
+	@Override
+	public IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) {
+		return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase));
 	}
 
 	@Override
@@ -93,4 +99,9 @@
 	public AttResAdVO getWaterRegionInfoByResGuid(String guid) {
 		return baseMapper.getWaterRegionInfoByResGuid(guid);
 	}
+
+	@Override
+	public int getDimResInfoACount() {
+		return baseMapper.getDimResInfoACount();
+	}
 }

--
Gitblit v1.9.3