From 79bdd61d35e659f74c9ff50ebc0876f7b3b5f41f 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 16:01:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DlDriveSchoolStudentController.java | 15 +++++++ .../base/entity/DlDriveSchoolStudent.java | 4 ++ .../service/DlDriveSchoolStudentService.java | 8 ++++ .../impl/DlDriveSchoolStudentServiceImpl.java | 44 ++++++++++++++++--- 4 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java index f0e5173d..3a2ab82c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java @@ -189,5 +189,20 @@ public class DlDriveSchoolStudentController { return success(schoolStudentService.indexGetFormList(startTimeStr,endTimeStr)); } + /** + * 获取学员详细信息 + * + * @param uniqueCode 学员id + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 9:58 2025/2/10 + **/ + @GetMapping("/getByUniqueCode") + @Operation(summary = "获得驾校学员") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult getDlDriveSchoolStudentByUniqueCode(@RequestParam("uniqueCode") String uniqueCode) { + return success(schoolStudentService.queryStudentByUniqueCode(uniqueCode)); + } + } \ No newline at end of file diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolStudent.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolStudent.java index 79673270..ddd8d0aa 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolStudent.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolStudent.java @@ -101,5 +101,9 @@ public class DlDriveSchoolStudent extends TenantBaseDO { * 毕业时间 */ private String gradTime; + /** + * 唯一码 + */ + private String uniqueCode; } \ No newline at end of file diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java index 7414b1f2..2cb88619 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java @@ -152,4 +152,12 @@ public interface DlDriveSchoolStudentService extends IService queryWrapper = new LambdaQueryWrapper() + DlDriveSchoolStudent student = getOne(Wrappers.lambdaQuery() .eq(DlDriveSchoolStudent::getUserId, userId) - .orderByDesc(BaseDO::getCreateTime); - List list = this.list(queryWrapper); - return list.isEmpty() ? null : list.get(0); + .orderByDesc(DlDriveSchoolStudent::getCreateTime) + .last("limit 1")); + + // 如果没有找到，则返回null + if (ObjectUtil.isEmpty(student)) { + return null; + } else { + // 判断是否有唯一码 + if (StringUtils.isBlank(student.getUniqueCode())) { + // 生成唯一推广码 + String uniqueCode = uniqueCodeService.createUniqueCode(); + student.setUniqueCode(uniqueCode); + dlDriveSchoolStudentMapper.updateById(student); + } + return student; + } } /** @@ -256,7 +278,7 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpllambdaQuery().eq(DlDriveSchoolStudent::getUniqueCode, uniqueCode)), + DlDriveSchoolStudentVO.class); + } + } From 25ca575b2709eb89aeee508d7c85cfe764e90679 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 17:39:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/course/service/impl/ProcessServiceImpl.java | 1 + .../train/service/impl/ReservationCourseServiceImpl.java | 2 +- .../main/resources/mapper/base/DlDriveSchoolStudentMapper.xml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) 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 462b00c3..ba0974bd 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 @@ -431,6 +431,7 @@ public class ProcessServiceImpl extends ServiceImpl impl .in(Process::getStatus, Arrays.asList("1", "2")) .in(Process::getSubject, Arrays.asList(1, 4)) .isNotNull(Process::getExamScore) + .orderByDesc(Process::getExamTime) ); List examBatchItemNew = examBatchItemMapper.selectExamByUserIdAndCoachId(userId, null); List result = new ArrayList<>(); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/impl/ReservationCourseServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/impl/ReservationCourseServiceImpl.java index 6af932af..9bbdca6c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/impl/ReservationCourseServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/impl/ReservationCourseServiceImpl.java @@ -88,7 +88,7 @@ public class ReservationCourseServiceImpl extends ServiceImpl - AND dss.create_time >= #{startTime} + AND dss.create_time >= #{entity.startTime} - AND dss.create_time <= #{endTime} + AND dss.create_time <= #{entity.endTime} AND dss.id IS NOT NULL ORDER BY