From f00389d7d9a0a299c67a85fdf8f0665d4ce8ab3a Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Tue, 1 Apr 2025 17:55:33 +0800 Subject: [PATCH] 0401-2 --- dl-module-base/pom.xml | 12 ++++++ dl-module-company/pom.xml | 6 ++- ...riveSchoolCoachSmallProgramController.java | 43 +++++++++++++++++++ ...veSchoolStudentSmallProgramController.java | 28 ++++++++++++ .../service/DlDriveSchoolStudentService.java | 11 ++++- .../impl/DlDriveSchoolStudentServiceImpl.java | 22 ++++++++-- .../controller/admin/ProcessController.java | 4 +- .../resources/mapper/course/ProcessMapper.xml | 3 +- dl-module-repair/pom.xml | 4 ++ 9 files changed, 126 insertions(+), 7 deletions(-) diff --git a/dl-module-base/pom.xml b/dl-module-base/pom.xml index 8d0bfd04..5a5c497f 100644 --- a/dl-module-base/pom.xml +++ b/dl-module-base/pom.xml @@ -141,5 +141,17 @@ 3.1.837 + + org.apache.poi + poi + 5.2.5 + compile + + + org.apache.poi + poi + 5.2.5 + compile + diff --git a/dl-module-company/pom.xml b/dl-module-company/pom.xml index 8e45cd02..8ddebd75 100644 --- a/dl-module-company/pom.xml +++ b/dl-module-company/pom.xml @@ -87,6 +87,10 @@ org.springframework.boot spring-boot-starter-mail + + cn.iocoder.boot + yudao-common + - \ No newline at end of file + 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 d56937ba..450bdd62 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 @@ -1,13 +1,19 @@ 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.tenant.core.aop.TenantIgnore; +import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoachCourse; +import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachCourseService; 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.DlDriveSchoolCoachVO; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -18,6 +24,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.annotation.security.PermitAll; +import java.util.List; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "小程序 - 驾校教练") @@ -29,6 +37,9 @@ public class DlDriveSchoolCoachSmallProgramController { @Resource private DlDriveSchoolCoachService dlDriveSchoolCoachService; + @Resource + private DlDriveSchoolCoachCourseService coachCourseService; + /** * 驾校教练、普通员工列表 * @@ -49,4 +60,36 @@ public class DlDriveSchoolCoachSmallProgramController { Page page = new Page<>(pageNo, pageSize); return success(dlDriveSchoolCoachService.queryListPage(pageReqVO, page)); } + + /** + * 通过课程id查询课程与教练关联关系 + * + * @param courseId 课程id + * @return java.util.List + * @author PQZ + * @date 14:17 2025/2/8 + **/ + @GetMapping("/queryCoachByCourseId") + @TenantIgnore + @PermitAll + public List queryByCourseId(String courseId) { + return coachCourseService.queryByCourseId(courseId); + + } + + /** + * + * @author vinjor-M + * @date 15:41 2025/2/18 + * @param userId userId + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + **/ + @GetMapping("/getCoachByUserId") + @Operation(summary = "根据userId获得驾校教练信息") + @Parameter(name = "userId", description = "用户id", required = true, example = "1024") + @TenantIgnore + @PermitAll + public CommonResult getCoachByUserId(@RequestParam("userId") Long userId) { + return success(dlDriveSchoolCoachService.getDlDriveSchoolCoachByUserId(userId)); + } } 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 9cb7abe0..209abee9 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 @@ -1,17 +1,25 @@ 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.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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.annotation.security.PermitAll; import javax.validation.Valid; +import java.util.List; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "驾校学员") @@ -23,8 +31,13 @@ public class DlDriveSchoolStudentSmallProgramController { @Resource private DlDriveSchoolStudentService schoolStudentService; + @Autowired + private DlDriveSchoolStudentService studentService; + @PostMapping("/create") @Operation(summary = "创建驾校学员") + @TenantIgnore + @PermitAll public CommonResult createDlDriveSchoolStudent(@Valid @RequestBody DlDriveSchoolStudentVO createReqVO) { return success(schoolStudentService.createDlDriveSchoolStudent(createReqVO)); } @@ -50,4 +63,19 @@ public class DlDriveSchoolStudentSmallProgramController { public CommonResult getDlDriveSchoolStudent(@RequestParam("id") String id) { return success(schoolStudentService.queryStudentById(id)); } + + /** + * 根据userID查学员详情 + * + * @param userId 用户ID + * @return cn.iocoder.yudao.module.base.entity.DlDriveSchoolStudent + * @author vinjor-M + * @date 22:17 2025/1/20 + **/ + @GetMapping("/getByUserId") + @TenantIgnore + @PermitAll + public CommonResult getStudentByUserId(Long userId) { + return success(studentService.getStudentByUserId(userId)); + } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java index b3cad31e..61d56a3d 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java @@ -26,6 +26,15 @@ public interface DlDriveSchoolStudentService extends IService indexGetFormList( String startTimeStr, String endTimeStr); -} \ No newline at end of file +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java index 83c261bf..9559ce19 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java @@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.base.vo.DlDriveSchoolStudentVO; import cn.iocoder.yudao.module.base.vo.StudentCountVO; import cn.iocoder.yudao.module.course.service.ProcessService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -40,11 +41,26 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl and dsp.coach_name like concat('%', #{entity.coachName}, '%') and dsp.user_name like concat('%', #{entity.userName}, '%') - and dsc.name like concat('%', #{entity.courseName}, '%') + and dsp.name like concat('%', #{entity.courseName}, '%') + and dsp.user_id = #{entity.userId} order by dsp.create_time desc diff --git a/dl-module-repair/pom.xml b/dl-module-repair/pom.xml index c28df541..913afcc8 100644 --- a/dl-module-repair/pom.xml +++ b/dl-module-repair/pom.xml @@ -31,6 +31,10 @@ poi-tl 1.10.0 + + org.projectlombok + lombok + 8