From 8259f8e03a2ad296b2a6ec8454ceb2f8979bbaf7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 02 Apr 2024 15:23:17 +0800
Subject: [PATCH] 高程基准面修改,责任人列表添加姓名和手机号查询条件,增加后端导出接口

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 7 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 73d6b39..5242733 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
@@ -2,15 +2,14 @@
 
 import cn.gistack.sm.intelligentCall.mapper.CallTaskMapper;
 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.entity.RelResLabel;
+import cn.gistack.sm.sjztmd.excel.AttResBaseUserExcel;
 import cn.gistack.sm.sjztmd.mapper.AttResBaseMapper;
 import cn.gistack.sm.sjztmd.service.IAttResBaseService;
 import cn.gistack.sm.sjztmd.service.IRelResLabelService;
-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 cn.gistack.sm.sjztmd.vo.*;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,6 +20,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -48,8 +48,13 @@
 	}
 
 	@Override
-	public IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) {
-		return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase));
+	public Object selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) {
+
+		if (attResBase.getIsPage()){
+			return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase));
+		}else {
+			return baseMapper.selectAttResBaseGeneralInvestigation(null,attResBase);
+		}
 	}
 
 	@Override
@@ -81,6 +86,15 @@
 		return page.setRecords(attResBaseUserDTOList);
 	}
 
+
+	@Override
+	public List<AttResBaseUserExcel> exportAttResBaseUser(Map<String, Object> params) {
+
+
+		List<AttResBaseUserExcel> attResBaseUserDTOList = baseMapper.getAttResBaseUserExcel(params);
+		return attResBaseUserDTOList;
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean updateResBaseByGuid(AttResBase attResBase) {
@@ -89,7 +103,6 @@
 
 		//向水库标签表中更新数据
 		relResLabelService.updateEntity(attResBase.getGuid(),attResBase.getLabel());
-
 
 		return baseMapper.updateResBaseByGuid(attResBase);
 	}
@@ -123,4 +136,26 @@
 	public Boolean updateIsShowStatus(String ids, Integer status) {
 		return baseMapper.updateIsShowStatus(ids,status);
 	}
+
+	/**
+	 * 根据水库名称、所在区域查询改水库的数量
+	 * @param resName 水库名称
+	 * @param countyCode 区县
+	 * @return
+	 */
+	@Override
+	public Integer getWaterCountByResNameAndCountyName(String resName, String countyCode) {
+		return baseMapper.getWaterCountByResNameAndCountyName(resName,countyCode);
+	}
+
+	@Override
+	public AttResAdVO getResAd(String resId) {
+		return baseMapper.getResAd(resId);
+	}
+
+	@Override
+	public AttAdBase getYwxtResInfo(String cityName, String countyName) {
+		return baseMapper.getYwxtResInfo(cityName,countyName);
+	}
+
 }

--
Gitblit v1.9.3