From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 13:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java | 2 +-
src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java | 7 ++++++-
src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java | 3 +++
src/main/resources/mapper/ClassesUserMapper.xml | 4 ++--
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
index 436c59a..c371fbd 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
@@ -95,7 +95,7 @@
@GetMapping("/my")
@PreAuthorize("hasAuthority('classes:my')")
- @ApiOperation(value = "鎴戠殑鐝骇", notes = "鎴戠殑鐝骇")
+ @ApiOperation(value = "鎴戠殑鐝骇(鑰佸笀鐨勭彮绾�)", notes = "鎴戠殑鐝骇(鑰佸笀鐨勭彮绾�)")
public Result myClassList() {
return classesService.myClassList();
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
index 78a8613..6f47b44 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
@@ -182,9 +182,14 @@
@Override
public Result myClassList() {
Integer userId = webContext.getCurrentUser().getId();
+ List<ClassesUser> classes = new LambdaQueryChainWrapper<>(classesUserService.getBaseMapper())
+ .eq(ClassesUser::getTeacher, Boolean.TRUE)
+ .eq(ClassesUser::getUserId, userId)
+ .list();
+ List<Integer> classesIds = classes.stream().map(ClassesUser::getClassesId).collect(Collectors.toList());
List<Classes> list = new LambdaQueryChainWrapper<>(baseMapper)
.select(Classes::getId, Classes::getClassName)
- .eq(Classes::getCreateUser, userId)
+ .in(Classes::getId, classesIds)
.list();
return Result.ok(list);
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
index 89de8b7..909cc65 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
@@ -87,6 +87,7 @@
ClassesUser classesUser = new ClassesUser();
classesUser.setClassesId(form.getClassesId());
classesUser.setUserId(user.getId());
+ classesUser.setTeacher(Boolean.FALSE);
baseMapper.insert(classesUser);
return Result.ok("娣诲姞鎴愬姛");
}
@@ -158,12 +159,14 @@
// 鍏堝垹闄や箣鍓嶇殑
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(ClassesUser::getClassesId, form.getId())
+ .eq(ClassesUser::getTeacher, Boolean.FALSE)
.remove();
// 鍐嶆柊澧�
List<ClassesUser> classesUserList = form.getStudentList().stream().map(item -> {
ClassesUser classesUser = new ClassesUser();
classesUser.setClassesId(form.getId());
classesUser.setUserId(item);
+ classesUser.setTeacher(Boolean.FALSE);
return classesUser;
}).collect(Collectors.toList());
this.saveBatch(classesUserList);
diff --git a/src/main/resources/mapper/ClassesUserMapper.xml b/src/main/resources/mapper/ClassesUserMapper.xml
index d9a7f98..8230ef9 100644
--- a/src/main/resources/mapper/ClassesUserMapper.xml
+++ b/src/main/resources/mapper/ClassesUserMapper.xml
@@ -54,7 +54,7 @@
TU.status
FROM t_classes_user TCU
LEFT JOIN t_user TU ON TU.id = TCU.user_id and TU.deleted = 0
- WHERE TCU.deleted = 0 AND TCU.classes_id = #{query.classesId}
+ WHERE TCU.deleted = 0 AND TCU.classes_id = #{query.classesId} AND TCU.teacher = 0
<if test="query.studentName != null and query.studentName != ''">AND TU.real_name like concat('%',
#{query.studentName}, '%')
</if>
@@ -71,7 +71,7 @@
t_classes_user TCU
INNER JOIN t_user TU ON TU.id = TCU.user_id AND TCU.classes_id = #{classesId}
WHERE
- TCU.deleted = 0
+ TCU.deleted = 0 AND TCU.teacher = 0
</select>
<select id="getClassesByUserId" resultType="java.lang.Integer">
--
Gitblit v1.8.0