From cc98f525cbc17d4acdc095b50d382dbaf95c0b68 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期四, 28 九月 2023 10:50:09 +0800
Subject: [PATCH] bug修复

---
 exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java
index 907d442..1844e07 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java
@@ -1,8 +1,11 @@
 package com.gkhy.exam.noncoalmine.service.impl;
 
+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;
 import com.gkhy.exam.noncoalmine.model.modForm.ExamSiteModForm;
 import com.gkhy.exam.noncoalmine.model.query.ExamSiteQuery;
@@ -16,7 +19,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;
 
@@ -32,6 +34,8 @@
 	private SysDistrictService districtService;
 	@Autowired
 	private ExamSiteMapper examSiteMapper;
+	@Autowired
+	private TrainingInstitutionMapper institutionMapper;
 	@Override
 	public List<ExamSiteVO> listByPage(ExamSiteQuery query) {
 		SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -51,6 +55,10 @@
 			}
 		}
 		List<ExamSiteVO> trainingInstitutionVOS = examSiteMapper.listByPage(query);
+		trainingInstitutionVOS.forEach(item->{
+			TrainingInstitution trainingInstitution = institutionMapper.selectById(item.getInstitutionId());
+			item.setInstitutionName(trainingInstitution != null ? trainingInstitution.getInstitutionName() : "");
+		});
 		return trainingInstitutionVOS;
 	}
 
@@ -78,5 +86,13 @@
 		BeanUtils.copyProperties(modForm,examSite);
 		return baseMapper.updateById(examSite);
 	}
+
+	@Override
+	public void delBatch(List<Long> siteIds) {
+		UpdateWrapper<ExamSite> updateWrapper = new UpdateWrapper<>();
+		updateWrapper.in("site_id",siteIds)
+				.set("del_flag",(byte)2);
+		this.update(updateWrapper);
+	}
 }
 

--
Gitblit v1.9.2