Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 9304aba1d5299f80db70f65a659807a6ffa1024d

 src/main/java/com/ycl/jxkg/service/impl/MeetServiceImpl.java

@@ -13,7 +13,9 @@
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;
import com.ycl.jxkg.mapper.ClassesUserMapper;
import com.ycl.jxkg.mapper.MeetMapper;
@@ -135,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());
    }

@@ -152,11 +160,11 @@
        Meet entity = baseMapper.selectById(form.getId());
        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        entity.setStatus(form.getStatus());
        // 不使用updateById这种方式，避免乐观锁加一。
        new LambdaUpdateChainWrapper<>(meetMapper)
                .eq(Meet::getId, entity.getId())
                .update(entity);
                .set(Meet::getStatus,form.getStatus())
                .update();
        return Result.ok();
    }

@@ -222,6 +230,19 @@
        return Result.ok().data(vos);
    }

    @Override
    public Result getStudentList(Integer meetId, String keyword) {
        List<StudentSimpleVO> studentList = baseMapper.getStudentList(meetId, keyword);
        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消息
     *