Merge branch 'driver' of http://122.51.230.86:3000/dianliang/lanan-system into driver

dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java

@@ -47,12 +47,18 @@ public class DlDriveSchoolStudentController {
         return success(true);
     }
 
+    /**
+     * 获取学员详细信息
+     * @author PQZ
+     * @date 9:58 2025/2/10
+     * @param id 学员id
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<cn.iocoder.yudao.module.base.vo.DlDriveSchoolStudentVO>
+    **/
     @GetMapping("/get")
     @Operation(summary = "获得驾校学员")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    public CommonResult<DlDriveSchoolStudent> getDlDriveSchoolStudent(@RequestParam("id") String id) {
+    public CommonResult<DlDriveSchoolStudentVO> getDlDriveSchoolStudent(@RequestParam("id") String id) {
-        DlDriveSchoolStudent dlDriveSchoolStudent = schoolStudentService.getById(id);
+        return success(schoolStudentService.queryStudentById(id));
-        return success(dlDriveSchoolStudent);
     }
 
     /**

dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java

@@ -25,6 +25,16 @@ public interface DlDriveSchoolStudentService extends IService<DlDriveSchoolStude
      */
     String createDlDriveSchoolStudent(@Valid DlDriveSchoolStudentVO createReqVO);
 
+    /**
+     * 获取学员详细信息
+     *
+     * @param id 学员id
+     * @return cn.iocoder.yudao.module.base.vo.DlDriveSchoolStudentVO
+     * @author PQZ
+     * @date 9:58 2025/2/10
+     **/
+    DlDriveSchoolStudentVO queryStudentById(String id);
+
     /**
      * 更新驾校学员
      *
@@ -49,10 +59,11 @@ public interface DlDriveSchoolStudentService extends IService<DlDriveSchoolStude
 
     /**
      * 根据userID查学员详情
-     * @author vinjor-M 
+     *
-     * @date 22:17 2025/1/20
      * @param userId 用户ID
      * @return cn.iocoder.yudao.module.base.entity.DlDriveSchoolStudent
+     * @author vinjor-M
+     * @date 22:17 2025/1/20
      **/
     DlDriveSchoolStudent getStudentByUserId(Long userId);
 
@@ -69,21 +80,23 @@ public interface DlDriveSchoolStudentService extends IService<DlDriveSchoolStude
 
     /**
      * 获取可以考试的学员列表
-     * @author vinjor-M
+     *
-     * @date 23:16 2025/1/20
      * @param courseId 课程ID
      * @param subject  科目
      * @return List<DlDriveSchoolStudent>
+     * @author vinjor-M
+     * @date 23:16 2025/1/20
      **/
-    List<DlDriveSchoolStudent> getCanExamStudentList(String courseId, Integer subject,String userName);
+    List<DlDriveSchoolStudent> getCanExamStudentList(String courseId, Integer subject, String userName);
 
     /**
      * 手机端获取学员
-     * @author PQZ
+     *
-     * @date 14:47 2025/2/6
      * @param staffVO {@link DlDriveSchoolStaffVO}
      * @param page    分页参数
      * @return com.baomidou.mybatisplus.core.metadata.IPage<cn.iocoder.yudao.module.base.vo.DlDriveSchoolStaffVO>
+     * @author PQZ
+     * @date 14:47 2025/2/6
      **/
     IPage<DlDriveSchoolStaffVO> pageStaffStudent(DlDriveSchoolStaffVO staffVO, Page<DlDriveSchoolStaffVO> page);
 }

dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java

@@ -39,6 +39,23 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl<DlDriveSchoolSt
         return dlDriveSchoolStudent.getId();
     }
 
+    /**
+     * 获取学员详细信息
+     *
+     * @param id 学员id
+     * @return cn.iocoder.yudao.module.base.vo.DlDriveSchoolStudentVO
+     * @author PQZ
+     * @date 9:58 2025/2/10
+     **/
+    @Override
+    public DlDriveSchoolStudentVO queryStudentById(String id) {
+        //学员基本信息
+        DlDriveSchoolStudent student = getById(id);
+        DlDriveSchoolStudentVO result = BeanUtils.toBean(student,DlDriveSchoolStudentVO.class);
+
+        return result;
+    }
+
     @Override
     public void updateDlDriveSchoolStudent(DlDriveSchoolStudentVO updateReqVO) {
         // 更新