Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d

Merge remote-tracking branch 'origin/master'

 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();
    }

 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);
    }

 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);

 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">