From 093fac278c7931e8160209a428729d5a82d5cd72 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 27 十月 2024 21:29:09 +0800
Subject: [PATCH] 一个班级可以有多个老师
---
src/main/java/com/ycl/jxkg/controller/admin/UserController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
index eede22b..9f6bf0e 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
@@ -31,6 +31,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;
@@ -45,6 +46,7 @@
private final WebContext webContext;
private final Integer teacher = 2;
private final Integer student = 1;
+
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
public Result<PageInfo<UserResponseVO>> pageList(@RequestBody UserPageRequestVO model) {
if(!student.equals(model.getRole())) {
@@ -70,6 +72,20 @@
return student;
}).collect(Collectors.toList());
return Result.ok().data(studentVOS);
+ }
+
+ @RequestMapping(value = "/teacher/list", method = RequestMethod.GET)
+ public Result<?> teacherList() {
+ List<User> teacherList = new LambdaQueryChainWrapper<>(userService.getBaseMapper())
+ .eq(User::getRole, RoleEnum.TEACHER.getCode())
+ .orderByDesc(User::getCreateTime)
+ .list();
+ List<StudentVO> teachers = teacherList.stream().map(item -> {
+ StudentVO student = new StudentVO();
+ BeanUtils.copyProperties(item, student);
+ return student;
+ }).collect(Collectors.toList());
+ return Result.ok().data(teachers);
}
@RequestMapping(value = "/classes/students", method = RequestMethod.GET)
@@ -117,17 +133,9 @@
return new Result<>(3, "瀵嗙爜涓嶈兘涓虹┖");
}
}
- if (StringUtils.isBlank(model.getBirthDay())) {
- model.setBirthDay(null);
- }
User user = new User();
BeanUtils.copyProperties(model, user);
user.setAge(model.getAge());
- try {
- user.setBirthDay(new SimpleDateFormat("yyyy-MM-dd").parse(model.getBirthDay()));
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
if (model.getId() == null) {
String encodePwd = authenticationService.pwdEncode(model.getPassword());
--
Gitblit v1.8.0