xiangpei
2024-10-29 161014ebc77c605cdb20fcdd7dc265a89d95d543
src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java
@@ -13,6 +13,7 @@
import com.ycl.jxkg.domain.entity.StudyRecord;
import com.ycl.jxkg.domain.form.MeetForm;
import com.ycl.jxkg.domain.query.MeetQuery;
import com.ycl.jxkg.domain.vo.ClassesVO;
import com.ycl.jxkg.domain.vo.MeetVO;
import com.ycl.jxkg.domain.vo.StudentSimpleVO;
import com.ycl.jxkg.enums.MeetStatusEnum;
@@ -136,15 +137,21 @@
    @Override
    public Result studentPage(MeetQuery query) {
        Integer userId = webContext.getCurrentUser().getId();
        //查出学生所在班级
        List<Integer> classes = classesUserMapper.getClassesByUserId(userId);
        if(CollectionUtils.isEmpty(classes)){
            return Result.ok("您暂未加入班级");
        if (CollectionUtils.isEmpty(query.getClassesIds())) {
            //查出学生所在班级
            List<Integer> classes = classesUserMapper.getClassesByUserId(userId);
            if(CollectionUtils.isEmpty(classes)){
                return Result.fail(500, "您暂未加入班级");
            }
            query.setClassesIds(classes);
        }
        query.setClassesIds(classes);
        IPage<MeetVO> page = PageUtil.getPage(query, MeetVO.class);
        baseMapper.getPage(page, query);
        for (MeetVO vo : page.getRecords()) {
            if (!CollectionUtils.isEmpty(vo.getTeacherNames())) {
                vo.setTeacherNamesStr(vo.getTeacherNames().stream().collect(Collectors.joining("、")));
            }
        }
        return Result.ok().data(page.getRecords()).total(page.getTotal());
    }
@@ -229,6 +236,13 @@
        return Result.ok().data(studentList);
    }
    @Override
    public Result getStudentClasses() {
        Integer userId = webContext.getCurrentUser().getId();
        List<ClassesVO> classes = classesUserMapper.getClassesByUserId1(userId);
        return Result.ok().data(classes);
    }
    /**
     * 发送mq消息
     *