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

学生教师树
build / build-push (push) Successful in 1m1s
Details

Browse Source
This commit is contained in:
wanghu
2026-09-11 11:27:34 +08:00
parent 2cf8334d74
commit 2d4f3db219
3 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/SchGroupController.java
+8 -6
View File
@@ -27,25 +27,27 @@ public class SchGroupController {
private ISchInfoService schInfoService;
@GetMapping("GetTeaTree")
@Operation(summary = "获取学校教师组树+教师（SchSerID 与 schId 二选一）")
@Operation(summary = "获取学校教师组树（toUser 默认 true 带教师，false 仅返回组骨架；SchSerID 与 schId 二选一）")
public List<TeaTreeVO> getTeaTree(@RequestParam(value = "SchSerID", required = false) String SchSerID,
@RequestParam(value = "schId", required = false) Integer schId) {
@RequestParam(value = "schId", required = false) Integer schId,
@RequestParam(value = "toUser", required = false, defaultValue = "true") boolean toUser) {
Integer resolvedSchId = resolveSchId(schId, SchSerID);
if (resolvedSchId == null) {
return Collections.emptyList();
}
return comSchTreeService.getSchTeaTree(resolvedSchId);
return comSchTreeService.getSchTeaTree(resolvedSchId, toUser);
}
@GetMapping("GetStuTree")
@Operation(summary = "获取学校学生树：学校→学段→年级→班级→学生（SchSerID 与 schId 二选一）")
@Operation(summary = "获取学校学生树：学校→学段→年级→班级→学生（toUser 默认 true 带学生，false 仅返回组织骨架；SchSerID 与 schId 二选一）")
public List<TeaTreeVO> getStuTree(@RequestParam(value = "SchSerID", required = false) String SchSerID,
@RequestParam(value = "schId", required = false) Integer schId) {
@RequestParam(value = "schId", required = false) Integer schId,
@RequestParam(value = "toUser", required = false, defaultValue = "true") boolean toUser) {
Integer resolvedSchId = resolveSchId(schId, SchSerID);
if (resolvedSchId == null) {
return Collections.emptyList();
}
return comSchTreeService.getSchStuTree(resolvedSchId);
return comSchTreeService.getSchStuTree(resolvedSchId, toUser);
}
/**
src/main/java/com/yunhai/bschclassmanage/service/IComSchTreeService.java
+2 -2
View File
@@ -29,9 +29,9 @@ public interface IComSchTreeService {
BoaGroup getTeacherTree(Integer schId);
List<TeaTreeVO> getSchTeaTree(Integer schId);
List<TeaTreeVO> getSchTeaTree(Integer schId, boolean toUser);
List<TeaTreeVO> getSchStuTree(Integer schId);
List<TeaTreeVO> getSchStuTree(Integer schId, boolean toUser);
List<SelectIntVO> getSchoolList();
src/main/java/com/yunhai/bschclassmanage/service/impl/com/ComSchTreeService.java
+44 -37
View File
@@ -446,9 +446,10 @@ public class ComSchTreeService implements IComSchTreeService {
* 结构：学校根(type=1) → 教师组(type=1) → 子组递归 + 教师叶子(type=2)。
* 节点字段：pid=父节点id（根为0）、no=组取 BoaGroup.sort / 教师固定 0、
* isParent=组true/教师false、photo 固定空串（本库无头像数据）。
* toUser=false 时只返回组织骨架（不查询、不挂载教师叶子）。
* 返回单元素列表（学校根节点）。
*/
public List<TeaTreeVO> getSchTeaTree(Integer schId) {
public List<TeaTreeVO> getSchTeaTree(Integer schId, boolean toUser) {
// 1. 学校根节点（远程组树的根即学校节点，取不到时用学校名兜底）
List<BoaGroup> schTree = getSchTree(schId);
BoaGroup schRoot = (schTree == null || schTree.isEmpty()) ? null : schTree.get(0);
@@ -479,37 +480,39 @@ public class ComSchTreeService implements IComSchTreeService {
groupVoMap.put(teaRootVo.getId(), teaRootVo);
rootVo.getChildren().add(teaRootVo);
// 3. 挂教师：多组各挂一份；无组或组不在树中的落到"未分组"
List<SchTeacher> teacherList = schTeacherService.getSchTeacherList(schId);
if (CollectionUtils.isNotEmpty(teacherList)) {
List<Integer> teaIds = teacherList.stream()
.map(SchTeacher::getTeaId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
Map<Integer, List<Integer>> teaIdToGroupIds = schTeacherGroupRepository.findByTeaIdInAndSchId(teaIds, schId)
.stream()
.collect(Collectors.groupingBy(SchTeacherGroup::getTeaId,
Collectors.mapping(SchTeacherGroup::getGroupId, Collectors.toList())));
// 3. 挂教师：多组各挂一份；无组或组不在树中的落到"未分组"（toUser=false 时不带用户，跳过查询）
if (toUser) {
List<SchTeacher> teacherList = schTeacherService.getSchTeacherList(schId);
if (CollectionUtils.isNotEmpty(teacherList)) {
List<Integer> teaIds = teacherList.stream()
.map(SchTeacher::getTeaId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
Map<Integer, List<Integer>> teaIdToGroupIds = schTeacherGroupRepository.findByTeaIdInAndSchId(teaIds, schId)
.stream()
.collect(Collectors.groupingBy(SchTeacherGroup::getTeaId,
Collectors.mapping(SchTeacherGroup::getGroupId, Collectors.toList())));
for (SchTeacher teacher : teacherList) {
if (teacher.getTeaId() == null) {
continue;
}
List<Integer> groupIds = teaIdToGroupIds.getOrDefault(teacher.getTeaId(), Collections.emptyList());
if (groupIds.isEmpty()) {
TeaTreeVO ungrouped = getOrCreateUngrouped(teaRootVo, groupVoMap);
ungrouped.getChildren().add(newTeacherNode(teacher, ungrouped.getId()));
} else {
for (Integer groupId : groupIds) {
TeaTreeVO groupVo = groupVoMap.get(groupId);
if (groupVo == null) {
groupVo = getOrCreateUngrouped(teaRootVo, groupVoMap);
}
// 同一节点下按 teaId 去重（防脏数据中同一组出现多条关联）
boolean exists = groupVo.getChildren().stream()
.anyMatch(c -> Integer.valueOf(2).equals(c.getType()) && c.getId().equals(teacher.getTeaId()));
if (!exists) {
groupVo.getChildren().add(newTeacherNode(teacher, groupVo.getId()));
for (SchTeacher teacher : teacherList) {
if (teacher.getTeaId() == null) {
continue;
}
List<Integer> groupIds = teaIdToGroupIds.getOrDefault(teacher.getTeaId(), Collections.emptyList());
if (groupIds.isEmpty()) {
TeaTreeVO ungrouped = getOrCreateUngrouped(teaRootVo, groupVoMap);
ungrouped.getChildren().add(newTeacherNode(teacher, ungrouped.getId()));
} else {
for (Integer groupId : groupIds) {
TeaTreeVO groupVo = groupVoMap.get(groupId);
if (groupVo == null) {
groupVo = getOrCreateUngrouped(teaRootVo, groupVoMap);
}
// 同一节点下按 teaId 去重（防脏数据中同一组出现多条关联）
boolean exists = groupVo.getChildren().stream()
.anyMatch(c -> Integer.valueOf(2).equals(c.getType()) && c.getId().equals(teacher.getTeaId()));
if (!exists) {
groupVo.getChildren().add(newTeacherNode(teacher, groupVo.getId()));
}
}
}
}
@@ -588,9 +591,10 @@ public class ComSchTreeService implements IComSchTreeService {
* 班级=sch_class（id=group_class_id，名称 cname 优先，no=sort，不含毕业班），
* 学生仅取在读正常状态（复用按班缓存查询，已过滤休学/转出/禁用并按 sort 排序）。
* 节点契约与 getSchTeaTree 相同：组织节点 type=1、isParent=true；学生叶子 type=2、isParent=false、children=null。
* toUser=false 时只返回组织骨架（不查询、不挂载学生叶子）。
* 返回单元素列表（学校根节点）。
*/
public List<TeaTreeVO> getSchStuTree(Integer schId) {
public List<TeaTreeVO> getSchStuTree(Integer schId, boolean toUser) {
TeaTreeVO rootVo = new TeaTreeVO();
rootVo.setId(schId);
rootVo.setName(getSchoolName(schId));
@@ -637,12 +641,15 @@ public class ComSchTreeService implements IComSchTreeService {
grade.getGradeId(), clazz.getSort());
gradeVo.getChildren().add(classVo);
List<SchStudent> students = schStudentService.getSchGradeClassStudentCacheList(schId, null, null, clazz.getClassId());
for (SchStudent student : students) {
if (student.getStuId() == null) {
continue;
// toUser=false 时不带用户，跳过按班查询
if (toUser) {
List<SchStudent> students = schStudentService.getSchGradeClassStudentCacheList(schId, null, null, clazz.getClassId());
for (SchStudent student : students) {
if (student.getStuId() == null) {
continue;
}
classVo.getChildren().add(newStudentNode(student, clazz.getClassId()));
}
classVo.getChildren().add(newStudentNode(student, clazz.getClassId()));
}
}
}