hbwri/skjcmanager.git

			@@ -2,8 +2,10 @@

			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;
			@@ -46,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
			@@ -79,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) {
			@@ -87,7 +103,6 @@

			//向水库标签表中更新数据
			relResLabelService.updateEntity(attResBase.getGuid(),attResBase.getLabel());


			return baseMapper.updateResBaseByGuid(attResBase);
			}
			@@ -137,4 +152,10 @@
			public AttResAdVO getResAd(String resId) {
			return baseMapper.getResAd(resId);
			}

			@Override
			public AttAdBase getYwxtResInfo(String cityName, String countyName) {
			return baseMapper.getYwxtResInfo(cityName,countyName);
			}

			}