diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/mapper/ProcessMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/mapper/ProcessMapper.java index 71a34279..5d5b1013 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/mapper/ProcessMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/mapper/ProcessMapper.java @@ -122,5 +122,6 @@ public interface ProcessMapper extends BaseMapper { */ IPage getPassedStudentsByCoachAndExamNum(@Param("coachId")Long coachId, @Param("subject")Integer subject, @Param("examNum")Integer examNum, @Param("name")String name, @Param("courseType") String courseType, @Param("startTime") String startTime, @Param("endTime")String endTime, Page page); + IPage getMyCourseStudentPage(@Param("entity") Process entity, Page page); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java index 3ac815b1..bf839c54 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java @@ -143,11 +143,13 @@ public class ProcessServiceImpl extends ServiceImpl impl public IPage getMyCourseStudentPage(Process process, Page page) { //当前教练ID Long userId = SecurityFrameworkUtils.getLoginUserId(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + process.setCoachId(userId); +// processMapper.getMyCourseStudentPage(process, page); + /*LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(Process::getCoachId, userId) .notIn(Process::getSubject, Arrays.asList(1, 4)); - /*.eq(Process::getCourseId, process.getCourseId()) - .eq(Process::getSubject, process.getSubject());*/ + *//*.eq(Process::getCourseId, process.getCourseId()) + .eq(Process::getSubject, process.getSubject());*//* if (process != null && process.getCourseId() != null) { queryWrapper.eq(Process::getCourseId, process.getCourseId()); } @@ -156,7 +158,8 @@ public class ProcessServiceImpl extends ServiceImpl impl } if (process != null && StringUtils.isNotEmpty(process.getUserName())) { queryWrapper.like(Process::getUserName, process.getUserName()); - } + }*/ + //状态等于1-训练中的 /*if(dictDataService.getValueByTypeAndLabel("check_in_switch", "科二科三同时打卡开关").equals("0")){ // 开关为0时,只查询状态为1的记录 @@ -169,11 +172,13 @@ public class ProcessServiceImpl extends ServiceImpl impl // 其他查询条件 queryWrapper.and(wrapper -> wrapper.isNull(Process::getExamStatus).or().eq(Process::getExamStatus, "0")) .orderByDesc(BaseDO::getCreateTime);*/ - queryWrapper.in(Process::getStatus, Arrays.asList("0", "1")) + /*queryWrapper.in(Process::getStatus, Arrays.asList("0", "1")) .and(wrapper -> wrapper.isNull(Process::getExamStatus).or().eq(Process::getExamStatus, "0")) // .groupBy(Process::getUserId) .orderByDesc(BaseDO::getCreateTime); - return this.page(page, queryWrapper); + // 需要查询订单表中是否终止 + return this.page(page, queryWrapper);*/ + return processMapper.getMyCourseStudentPage(process, page); } /** diff --git a/dl-module-jx/src/main/resources/mapper/course/ProcessMapper.xml b/dl-module-jx/src/main/resources/mapper/course/ProcessMapper.xml index 51547a45..4aef0044 100644 --- a/dl-module-jx/src/main/resources/mapper/course/ProcessMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/course/ProcessMapper.xml @@ -756,4 +756,27 @@ AND p.course_type = #{courseType} + + +