From ed35bab54d554b57b36ad2cd8d0967dd394e0a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Thu, 3 Apr 2025 17:32:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppProcessController.java | 70 ------------------- .../app/ProcessSmallProgramController.java | 17 +++++ ...iveSchoolReservationCourseServiceImpl.java | 4 ++ .../jx/DriveSchoolReservationCourseMapper.xml | 1 + 4 files changed, 22 insertions(+), 70 deletions(-) delete mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/AppProcessController.java diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/AppProcessController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/AppProcessController.java deleted file mode 100644 index 9ddf2792..00000000 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/AppProcessController.java +++ /dev/null @@ -1,70 +0,0 @@ -package cn.iocoder.yudao.module.course.controller.app; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; -import cn.iocoder.yudao.module.base.constant.SchoolBaseConstants; -import cn.iocoder.yudao.module.course.entity.Process; -import cn.iocoder.yudao.module.course.service.ProcessService; -import cn.iocoder.yudao.module.course.vo.ProcessAddVO; -import cn.iocoder.yudao.module.course.vo.ProcessVO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Tag(name = "小程序 - 学员课程进度") -@RestController -@RequestMapping("/process") -@Validated -public class AppProcessController { - - @Resource - private ProcessService processService; - - - /** - * 学员课程进度分页查询 - * - * @param pageReqVO {@link ProcessVO} - * @param pageNo 分页参数 - * @param pageSize 分页参数 - * @return cn.iocoder.yudao.framework.common.pojo.CommonResult> - * @author PQZ - * @date 15:33 2025/2/17 - **/ - @GetMapping("/page") - @Operation(summary = "学员课程进度分页") - public CommonResult> getDlDriveSchoolCoachPage(ProcessVO pageReqVO, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - Page page = new Page<>(pageNo, pageSize); - return success(processService.pageProcess(page, pageReqVO)); - } - - /** - * 通过学员id和课程id查询学员课程进度 - * - * @param courseId 课程id - * @return cn.iocoder.yudao.framework.common.pojo.CommonResult> - */ - @TenantIgnore - @GetMapping("/getAllByCourseId") - public CommonResult getAllByCourseId(String courseId) { - Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); - return success(processService.list(Wrappers.lambdaQuery(Process.class) - .eq(Process::getUserId, loginUserId) - .eq(Process::getCourseId, courseId))); - } - -} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/ProcessSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/ProcessSmallProgramController.java index 2df7b83f..846eea88 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/ProcessSmallProgramController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/ProcessSmallProgramController.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.course.controller.app; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.course.entity.Process; import cn.iocoder.yudao.module.course.service.ProcessService; import cn.iocoder.yudao.module.course.vo.ProcessVO; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -84,4 +86,19 @@ public class ProcessSmallProgramController { public CommonResult getExamListByUserId(Long userId) { return success(processService.getExamListByUserId(userId)); } + + /** + * 通过学员id和课程id查询学员课程进度 + * + * @param courseId 课程id + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult> + */ + @TenantIgnore + @GetMapping("/getAllByCourseId") + public CommonResult getAllByCourseId(String courseId) { + Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); + return success(processService.list(Wrappers.lambdaQuery(Process.class) + .eq(Process::getUserId, loginUserId) + .eq(Process::getCourseId, courseId))); + } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java index 1ffc7b26..13439b9a 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java @@ -282,6 +282,10 @@ public class DriveSchoolReservationCourseServiceImpl extends ServiceImpland dsrc.coach_id = #{entity.coachId} and dsrc.if_cancel = #{entity.ifCancel} + order by dsrc.create_time desc