From 5b0ae0a56120ce4bf37edf2eef9838622afa108f Mon Sep 17 00:00:00 2001
From: Lx <935448346@qq.com>
Date: Tue, 13 May 2025 17:50:49 +0800
Subject: [PATCH] =?UTF-8?q?0513=20=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=95=99=E7=BB=83=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DlDriveSchoolCoachServiceImpl.java    | 10 +++++++++-
 .../resources/mapper/base/DlDriveSchoolCoachMapper.xml |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

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 0c74f21c..5c7b1d8c 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
@@ -287,7 +287,7 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
         DlDriveSchoolCoach coach = getById(id);
         result.setCoachInfo(coach);
         /*2.车辆信息*/
-        DriveSchoolCar schoolCar = new DriveSchoolCar();
+        /*DriveSchoolCar schoolCar = new DriveSchoolCar();
         if (ObjectUtil.isNotEmpty(schoolCar)) {
             if (null != coach.getUserId()) {
                 schoolCar = schoolCarService.selectByCoachId(coach.getUserId());
@@ -296,6 +296,14 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
                     schoolCar.setCarOld(carOld);
                 }
             }
+        }*/
+        DriveSchoolCar schoolCar = null;
+        if (coach.getUserId() != null) {
+            schoolCar = schoolCarService.selectByCoachId(coach.getUserId());
+            if (schoolCar != null && schoolCar.getCarRegisterDate() != null) {
+                Long carOld = DateUtil.betweenYear(schoolCar.getCarRegisterDate(), new Date(), true);
+                schoolCar.setCarOld(carOld);
+            }
         }
         result.setCar(schoolCar);
         /*3.统计教练的学生基本信息*/
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 a7c77b42..f9b66a1a 100644
--- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml
@@ -41,7 +41,7 @@
                 LEFT JOIN drive_school_coach_course dscc ON main.id = dscc.coach_id AND dscc.deleted = 0
                 LEFT JOIN drive_school_car dsc ON main.user_id = dsc.user_id AND dsc.deleted = 0
         <where>
-            main.deleted = 0 AND dscc.is_sign = 1 AND dscc.deleted = 0 AND  dscc.if_end = 0
+            main.deleted = 0
             <if test="entity.type != null and entity.type != ''">
                 AND main.type = #{entity.type}
             </if>