From 157dbd679611829a80e3d274b666b6a11059bdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Wed, 9 Apr 2025 10:39:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=BA=E7=A1=80=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/utils/DriveSchoolBaseUtil.java | 31 +++++++++++++++++++ .../impl/SchoolFeedbackServiceImpl.java | 27 +++++----------- .../service/impl/ExamBatchServiceImpl.java | 2 +- .../admin/ReservationCourseController.java | 2 +- .../app/AppReservationCourseController.java | 24 +------------- .../train/service/impl/TrainServiceImpl.java | 2 +- 6 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/utils/DriveSchoolBaseUtil.java diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/utils/DriveSchoolBaseUtil.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/utils/DriveSchoolBaseUtil.java new file mode 100644 index 00000000..a7742f00 --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/utils/DriveSchoolBaseUtil.java @@ -0,0 +1,31 @@ +package cn.iocoder.yudao.module.base.utils; + +/** + * @Description: 驾校基础工具类 + * @Author: 86187 + * @Date: 2025/04/09 10:30 + * @Version: 1.0 + */ +public class DriveSchoolBaseUtil { + + /** + * 获取科目 + * + * @param subject 科目数字 + * @return 科目字符串 + */ + public static String getSubjectStr(Integer subject) { + switch (subject) { + case 1: + return "科目一"; + case 2: + return "科目二"; + case 3: + return "科目三"; + case 4: + return "科目四"; + default: + return "未知"; + } + } +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/SchoolFeedbackServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/SchoolFeedbackServiceImpl.java index d047b478..43e05bb0 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/SchoolFeedbackServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/SchoolFeedbackServiceImpl.java @@ -28,6 +28,8 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import static cn.iocoder.yudao.module.base.utils.DriveSchoolBaseUtil.getSubjectStr; + /** * 反馈Service业务层处理 * @@ -77,7 +79,8 @@ public class SchoolFeedbackServiceImpl extends ServiceImpl queryPage(Page page, SchoolFeedBackVO request) { // 1. 分页查询原始数据 IPage pageList = this.page(page, Wrappers.lambdaQuery(SchoolFeedBack.class) - .eq(ObjectUtil.isNotEmpty(request.getUserId()), SchoolFeedBack::getUserId, request.getUserId())); + .eq(ObjectUtil.isNotEmpty(request.getUserId()), SchoolFeedBack::getUserId, request.getUserId()) + .orderByDesc(SchoolFeedBack::getCreateTime)); // 2. 提取训练和考试的ID集合 List trainIds = pageList.getRecords().stream() @@ -111,11 +114,15 @@ public class SchoolFeedbackServiceImpl extends ServiceImpl voList = pageList.getRecords().stream().map(item -> { SchoolFeedBackVO vo = BeanUtil.copyProperties(item, SchoolFeedBackVO.class); if (SchoolBaseConstants.EVALUATE_TYPE_TRAIN.equals(item.getEvaluateType())) { + // 设置标题 vo.setBusiName(getSubjectStr(trainMap.get(item.getBusiId()).getSubject()) + "训练"); + // 设置课程类型和教练名 vo.setCourseType(trainMap.get(item.getBusiId()).getCourseType()); vo.setCoachName(trainMap.get(item.getBusiId()).getCoachName()); } else if (SchoolBaseConstants.EVALUATE_TYPE_EXAM.equals(item.getEvaluateType())) { + // 设置标题 vo.setBusiName(getSubjectStr(examMap.get(item.getBusiId()).getSubject()) + "考试"); + // 设置课程类型和教练名 vo.setCourseType(examMap.get(item.getBusiId()).getCourseType()); vo.setCoachName(examMap.get(item.getBusiId()).getCoachName()); } @@ -129,22 +136,4 @@ public class SchoolFeedbackServiceImpl extends ServiceImpl