This commit is contained in:
xyc 2025-04-29 10:33:08 +08:00
parent 80766669e0
commit bf96e6f341

View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.base.service.impl;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.common.SchoolRoleEnum; import cn.iocoder.yudao.common.SchoolRoleEnum;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@ -287,6 +288,7 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
result.setCoachInfo(coach); result.setCoachInfo(coach);
/*2.车辆信息*/ /*2.车辆信息*/
DriveSchoolCar schoolCar = new DriveSchoolCar(); DriveSchoolCar schoolCar = new DriveSchoolCar();
if (ObjectUtil.isNotEmpty(coach.getCarId())) {
if (null != coach.getUserId()) { if (null != coach.getUserId()) {
schoolCar = schoolCarService.selectByCoachId(coach.getUserId()); schoolCar = schoolCarService.selectByCoachId(coach.getUserId());
if (null != schoolCar.getCarRegisterDate()) { if (null != schoolCar.getCarRegisterDate()) {
@ -294,6 +296,7 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl<DlDriveSchoolCoac
schoolCar.setCarOld(carOld); schoolCar.setCarOld(carOld);
} }
} }
}
result.setCar(schoolCar); result.setCar(schoolCar);
/*3.统计教练的学生基本信息*/ /*3.统计教练的学生基本信息*/
//毕业情况 //毕业情况