swspkmas.git - Gitblit

			@@ -4,7 +4,6 @@
			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.TrainingInstitution;
			import com.gkhy.exam.noncoalmine.mapper.ExamSiteMapper;
			import com.gkhy.exam.noncoalmine.mapper.TrainingInstitutionMapper;
			import com.gkhy.exam.noncoalmine.model.addForm.ExamSiteAddForm;
			@@ -20,6 +19,7 @@
			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;

			@@ -37,6 +37,7 @@
			private ExamSiteMapper examSiteMapper;
			@Autowired
			private TrainingInstitutionMapper institutionMapper;

			@Override
			public List<ExamSiteVO> listByPage(ExamSiteQuery query) {
			SysUser user = SecurityUtils.getLoginUser().getUser();
			@@ -56,15 +57,16 @@
			}
			}
			List<ExamSiteVO> trainingInstitutionVOS = examSiteMapper.listByPage(query);
			trainingInstitutionVOS.forEach(item->{
			TrainingInstitution trainingInstitution = institutionMapper.selectById(item.getInstitutionId());
			item.setInstitutionName(trainingInstitution != null ? trainingInstitution.getInstitutionName() : "");
			});
			// trainingInstitutionVOS.forEach(item->{
			// TrainingInstitution trainingInstitution = institutionMapper.selectById(item.getInstitutionId());
			// item.setInstitutionName(trainingInstitution != null ? trainingInstitution.getInstitutionName() : "");
			// });
			return trainingInstitutionVOS;
			}

			/**
			* 新增
			*
			* @param addForm
			* @return
			*/
			@@ -78,6 +80,7 @@

			/**
			* 修改
			*
			* @param modForm
			* @return
			*/