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 |   68 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 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 54c3489..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
@@ -1,13 +1,23 @@
 package cn.gistack.sm.sjztmd.service.impl;
 
+import cn.gistack.sm.intelligentCall.mapper.CallTaskMapper;
+import cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO;
 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;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -22,9 +32,17 @@
 @DS("zt")
 public class AttResBaseServiceImpl extends ServiceImpl<AttResBaseMapper, AttResBase> implements IAttResBaseService {
 
+	@Autowired
+	private CallTaskMapper callTaskMapper;
+
 	@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
@@ -36,4 +54,54 @@
 	public AttResBase getDetailByCode(String code) {
 		return baseMapper.getDetailByCode(code);
 	}
+
+	/**
+	 * 获取水库对应责任人分页数据
+	 * @param params 条件查询参数对象
+	 * @param page 分页查询参数对象
+	 * @return
+	 */
+	@Override
+	public Object getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
+
+		Object isExport = params.get("isExport");
+		// 判断是否导出，导出不分页
+		if (null != isExport && !isExport.equals("")) {
+			return baseMapper.getAttResBaseUserPage(null,params);
+		}
+		List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,params);
+		// 返回数据
+		return page.setRecords(attResBaseUserDTOList);
+	}
+
+	@Override
+	public Boolean updateResBaseByGuid(AttResBase attResBase) {
+		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