userclass/UserclassService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

高校显示 班级名称 班级年级 班主任名称 模糊查询

Browse Source
This commit is contained in:
wanghu
2026-08-21 10:24:50 +08:00
parent 8a7118d278
commit e4014873bb
7 changed files with 76 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yunhai/bschclassmanage/service/ISchClassService.java
+1
View File
@@ -49,6 +49,7 @@ public interface ISchClassService {
Integer campusId,
Integer divisionId,
Integer majorsId,
String keyword,
Pageable pageable);
void saveHigherSchClass(UserContext.UserInfo user, SchClass entity);
src/main/java/com/yunhai/bschclassmanage/service/impl/SchClassService.java
+2 -2
View File
@@ -91,8 +91,8 @@ public class SchClassService implements ISchClassService {
@Override
public PageVO<HigherSchClassVO> searcHigherSchClass(Integer schId, Integer year, Integer campusId,
Integer divisionId, Integer majorsId, Pageable pageable) {
return queryService.searcHigherSchClass(schId, year, campusId, divisionId, majorsId, pageable);
Integer divisionId, Integer majorsId,String keyword, Pageable pageable) {
return queryService.searcHigherSchClass(schId, year, campusId, divisionId, majorsId,keyword, pageable);
}
@Override
src/main/java/com/yunhai/bschclassmanage/service/impl/classes/SchClassQueryService.java
+9 -6
View File
@@ -162,12 +162,12 @@ public class SchClassQueryService {
// ---------- 职业教育查询 ----------
public PageVO<HigherSchClassVO> searcHigherSchClass(Integer schId, Integer year, Integer campusId,
Integer divisionId, Integer majorsId, Pageable pageable) {
Integer divisionId, Integer majorsId,String keyword, Pageable pageable) {
List<Integer> years = new ArrayList<>();
if (year != null && year > 0) years.add(year);
years = years.isEmpty() ? null : years;
Page<SchClass> classPage = schClassRepository.findClassesByConditions(schId, campusId, divisionId, majorsId, years, pageable);
Page<SchClass> classPage = schClassRepository.findClassesByConditions(schId, campusId, divisionId, majorsId, years,keyword, pageable);
if (classPage.isEmpty()) {
return PageVO.empty(pageable.getPageSize());
}
@@ -176,9 +176,9 @@ public class SchClassQueryService {
Map<Integer, String> campusNameMap = schDicCampusService.toIdAndNameMap(schId);
Map<Integer, String> divisionsNameMap = schDicDivisionService.toIdAndNameMap(schId);
Map<Integer, String> majorssNameMap = schDicMajorsService.toIdAndNameMap(schId);
Map<Integer, String> teacherNameMap = schTeacherService.toIdAndNameMap(schId);
List<HigherSchClassVO> voList = classList.stream()
.map(clazz -> convertHigherSchClassToVO(clazz, campusNameMap, divisionsNameMap, majorssNameMap))
.map(clazz -> convertHigherSchClassToVO(clazz, campusNameMap, divisionsNameMap, majorssNameMap,teacherNameMap))
.collect(Collectors.toList());
return new PageVO<>(pageable.getPageNumber() + 1,
@@ -190,12 +190,15 @@ public class SchClassQueryService {
private HigherSchClassVO convertHigherSchClassToVO(SchClass clazz,
Map<Integer, String> campusNameMap,
Map<Integer, String> divisionsNameMap,
Map<Integer, String> majorssNameMap) {
Map<Integer, String> majorssNameMap,
Map<Integer, String> teacherNameMap) {
HigherSchClassVO vo = ModelMapperUtil.map(clazz, HigherSchClassVO.class);
vo.setCampusName(campusNameMap.get(clazz.getCampusId()));
vo.setDivisionName(divisionsNameMap.get(clazz.getDivisionId()));
vo.setMajorsName(majorssNameMap.get(clazz.getMajorsId()));
vo.setFirstTeacherName(null);
vo.setGradeName(vo.getGradeId()+"级");
vo.setFirstTeacherName(teacherNameMap.get(clazz.getFirstTeacherId()));
vo.setSecondTeacherName(null);
return vo;
}