diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java index 2088f389..e5de09c5 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java @@ -63,6 +63,21 @@ public class DlDriveSchoolCoachSmallProgramController { return success(dlDriveSchoolCoachService.queryListPage(pageReqVO, page)); } + /** + * 不分页获取教练信息 + * + * @param pageReqVO {@link DlDriveSchoolCoachPageReqVO} + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult> + * @author PQZ + * @date 14:25 2025/2/7 + **/ + @GetMapping("/list") + @Operation(summary = "不分页获取教练信息") + @TenantIgnore + public CommonResult> listSchoolCoach(DlDriveSchoolCoachPageReqVO pageReqVO) { + return success(dlDriveSchoolCoachService.listSchoolCoachApp(pageReqVO)); + } + /** * 通过课程id查询课程与教练关联关系 * diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java index 209abee9..8c3a8d63 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java @@ -2,10 +2,14 @@ package cn.iocoder.yudao.module.base.controller.app; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.framework.security.core.LoginUser; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.base.entity.DlDriveSchoolStudent; import cn.iocoder.yudao.module.base.service.DlDriveSchoolStudentService; import cn.iocoder.yudao.module.base.vo.DlDriveSchoolStudentVO; +import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -19,6 +23,7 @@ import javax.annotation.security.PermitAll; import javax.validation.Valid; import java.util.List; +import java.util.Set; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -34,6 +39,9 @@ public class DlDriveSchoolStudentSmallProgramController { @Autowired private DlDriveSchoolStudentService studentService; + @Resource + private AdminUserService userService; + @PostMapping("/create") @Operation(summary = "创建驾校学员") @TenantIgnore @@ -78,4 +86,13 @@ public class DlDriveSchoolStudentSmallProgramController { public CommonResult getStudentByUserId(Long userId) { return success(studentService.getStudentByUserId(userId)); } + + @GetMapping("/getUsersInfo") + @TenantIgnore + public CommonResult getUsersInfo(){ + LoginUser user = SecurityFrameworkUtils.getLoginUser(); + Long userId = user.getId(); + AdminUserDO sysUser = userService.getUser(userId); + return success(sysUser); + } } 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 9f19beab..0e2d5a2f 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 @@ -36,6 +36,7 @@ public interface DlDriveSchoolCoachService extends IService * @date 14:26 2025/2/7 **/ List listSchoolCoach(DlDriveSchoolCoachPageReqVO pageReqVO); + List listSchoolCoachApp(DlDriveSchoolCoachPageReqVO pageReqVO); /** * @param staffVO {@link DlDriveSchoolStaffVO} @@ -99,4 +100,4 @@ public interface DlDriveSchoolCoachService extends IService 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 65627d0a..9ef94c37 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 @@ -110,6 +110,20 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl listSchoolCoachApp(DlDriveSchoolCoachPageReqVO pageReqVO) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(BaseDO::getDeleted, 0).eq(DlDriveSchoolCoach::getType, "jl") + .eq(DlDriveSchoolCoach::getTenantId, pageReqVO.getTenantId()); + if (StringUtils.isNotEmpty(pageReqVO.getName())) { + lambdaQueryWrapper.like(DlDriveSchoolCoach::getName, pageReqVO.getName()); + } + if (StringUtils.isNotEmpty(pageReqVO.getPhone())) { + lambdaQueryWrapper.eq(DlDriveSchoolCoach::getPhone, pageReqVO.getPhone()); + } + return list(lambdaQueryWrapper); + } + /** * @param staffVO {@link DlDriveSchoolStaffVO} * @param page 分页参数 @@ -405,4 +419,4 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl