From 72f42a050b4a353020624e886ff8837dfa06bf2d Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Wed, 12 Feb 2025 14:59:55 +0800
Subject: [PATCH] 1

---
 .../admin/DlDriveSchoolCoachController.java   | 15 ++++++++++++
 .../service/DlDriveSchoolCoachService.java    |  9 ++++++++
 .../impl/DlDriveSchoolCoachServiceImpl.java   | 23 +++++++++++++++----
 .../yudao/module/base/vo/CoachInfoVO.java     | 17 ++++++++++++++
 .../module/base/vo/DlDriveSchoolStaffVO.java  |  2 ++
 .../mapper/base/DlDriveSchoolCoachMapper.xml  |  1 +
 .../base/DlDriveSchoolStudentMapper.xml       |  1 +
 7 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/CoachInfoVO.java

diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java
index efd06004..c4047e05 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java
@@ -111,5 +111,20 @@ public class DlDriveSchoolCoachController {
         return success(BeanUtils.toBean(dlDriveSchoolCoach, DlDriveSchoolCoachRespVO.class));
     }
 
+    /**
+     * 通过id获取教练信息
+     *
+     * @param id id
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+     * @author PQZ
+     * @date 13:47 2025/2/12
+     **/
+    @GetMapping("/getCoachById")
+    @Operation(summary = "获得驾校教练")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<?> appGetCoach(@RequestParam("id") String id) {
+        return success(dlDriveSchoolCoachService.getCoachById(id));
+    }
+
 
 }
\ No newline at end of file
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachService.java
index 8e136f25..9f19beab 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachService.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachService.java
@@ -89,5 +89,14 @@ public interface DlDriveSchoolCoachService extends IService<DlDriveSchoolCoach>
      */
     DlDriveSchoolCoachRespVO getDlDriveSchoolCoachByUserId(Long userId);
 
+    /**
+     * 通过教练id查询教练信息（APP使用）
+     * @author PQZ
+     * @date 13:49 2025/2/12
+     * @param id 教练id
+     * @return cn.iocoder.yudao.module.base.vo.CoachInfoVO
+    **/
+    CoachInfoVO getCoachById(String id);
+
 
 }
\ No newline at end of file
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachServiceImpl.java
index a494ea85..3bae8c64 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachServiceImpl.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachServiceImpl.java
@@ -5,10 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach;
 import cn.iocoder.yudao.module.base.mapper.DlDriveSchoolCoachMapper;
 import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachService;
-import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachPageReqVO;
-import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachRespVO;
-import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachSaveReqVO;
-import cn.iocoder.yudao.module.base.vo.DlDriveSchoolStaffVO;
+import cn.iocoder.yudao.module.base.vo.*;
 import cn.iocoder.yudao.module.jx.utils.StringUtils;
 import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -198,5 +195,23 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
         return schoolCoach;
     }
 
+    /**
+     * 通过教练id查询教练信息（APP使用）
+     *
+     * @param id 教练id
+     * @return cn.iocoder.yudao.module.base.vo.CoachInfoVO
+     * @author PQZ
+     * @date 13:49 2025/2/12
+     **/
+    @Override
+    public CoachInfoVO getCoachById(String id) {
+        CoachInfoVO result = new CoachInfoVO();
+        DlDriveSchoolCoach coach = getById(id);
+        //教练信息
+        result.setCoachInfo(coach);
+
+        return result;
+    }
+
 
 }
\ No newline at end of file
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/CoachInfoVO.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/CoachInfoVO.java
new file mode 100644
index 00000000..f8a68d61
--- /dev/null
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/CoachInfoVO.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.base.vo;
+
+import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach;
+import cn.iocoder.yudao.module.base.entity.DlDriveSchoolStudent;
+import cn.iocoder.yudao.module.course.entity.Process;
+import cn.iocoder.yudao.module.exam.vo.ExamBatchItemVO;
+import cn.iocoder.yudao.module.train.entity.Train;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CoachInfoVO {
+    /**教练基本信息*/
+    private DlDriveSchoolCoach coachInfo;
+
+}
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStaffVO.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStaffVO.java
index 7c33d0c1..629cc268 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStaffVO.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStaffVO.java
@@ -12,6 +12,8 @@ public class DlDriveSchoolStaffVO {
     private String type;
     /**人员姓名*/
     private String name;
+    /**头像*/
+    private String avatar;
     /**教龄*/
     private Integer seniority;
     /**车牌*/
diff --git a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml
index 0e4aca04..64b04879 100644
--- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml
@@ -31,6 +31,7 @@
             main.seniority AS seniority,
             main.car_id AS carId,
             main.phone AS phone,
+            main.image AS avatar,
             GROUP_CONCAT(DISTINCT dscc.course_type SEPARATOR ',') AS courseTypes
         FROM
             drive_school_coach main
diff --git a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml
index 880fdd28..9f64dda3 100644
--- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml
@@ -48,6 +48,7 @@
             main.id AS id,
             main.name AS name,
             main.type AS type,
+            main.avatar AS avatar,
             main.phone AS phone
         FROM
             drive_school_student main