hbwri/skjcmanager.git

			@@ -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);
			}
			@@ -134,4 +147,15 @@
			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);
			}

			}