~dongjh/swspkmas.git

			@@ -1,10 +1,12 @@
			package com.gkhy.exam.noncoalmine.service.impl;

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.gkhy.exam.noncoalmine.entity.ExamSite;
			import com.gkhy.exam.noncoalmine.entity.WorkRegistration;
			import com.gkhy.exam.noncoalmine.entity.TrainingInstitution;
			import com.gkhy.exam.noncoalmine.mapper.ExamSiteMapper;
			import com.gkhy.exam.noncoalmine.mapper.TrainingInstitutionMapper;
			import com.gkhy.exam.noncoalmine.model.addForm.ExamSiteAddForm;
			import com.gkhy.exam.noncoalmine.model.modForm.ExamSiteModForm;
			import com.gkhy.exam.noncoalmine.model.query.ExamSiteQuery;
			@@ -18,7 +20,6 @@
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.List;
			import java.util.stream.Collectors;

			@@ -34,6 +35,8 @@
			private SysDistrictService districtService;
			@Autowired
			private ExamSiteMapper examSiteMapper;
			@Autowired
			private TrainingInstitutionMapper institutionMapper;
			@Override
			public List<ExamSiteVO> listByPage(ExamSiteQuery query) {
			SysUser user = SecurityUtils.getLoginUser().getUser();
			@@ -53,6 +56,10 @@
			}
			}
			List<ExamSiteVO> trainingInstitutionVOS = examSiteMapper.listByPage(query);
			trainingInstitutionVOS.forEach(item->{
			TrainingInstitution trainingInstitution = institutionMapper.selectById(item.getInstitutionId());
			item.setInstitutionName(trainingInstitution != null ? trainingInstitution.getInstitutionName() : "");
			});
			return trainingInstitutionVOS;
			}

			@@ -88,5 +95,11 @@
			.set("del_flag",(byte)2);
			this.update(updateWrapper);
			}

			@Override
			public List<ExamSite> getSiteByInstitutionId(Long institutionId) {
			List<ExamSite> examSites = baseMapper.selectList(new LambdaQueryWrapper<ExamSite>().eq(ExamSite::getDelFlag, (byte) 0).eq(ExamSite::getInstitutionId, institutionId));
			return examSites;
			}
			}