From 1d7a423e3ae41b7547b99cb8036672156dc080e0 Mon Sep 17 00:00:00 2001 From: PQZ Date: Fri, 21 Feb 2025 10:27:25 +0800 Subject: [PATCH] 1 --- .../admin/DlDriveSchoolStudentController.java | 44 +++++++++++- .../mapper/DlDriveSchoolStudentMapper.java | 71 ++++++++++++------- .../service/DlDriveSchoolStudentService.java | 12 ++++ .../impl/DlDriveSchoolStudentServiceImpl.java | 14 ++++ .../base/DlDriveSchoolStudentMapper.xml | 25 +++++++ 5 files changed, 138 insertions(+), 28 deletions(-) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java index 622dcad4..b2742c90 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java @@ -126,7 +126,7 @@ public class DlDriveSchoolStudentController { **/ @GetMapping("/indexStuentList") @Operation(summary = "首页数据统计查询接口") - public CommonResult> indexGetTrainList(@RequestParam(value = "type") String type, + public CommonResult> indexStuentList(@RequestParam(value = "type") String type, @RequestParam(value = "timeType") String timeType, @RequestParam(value = "coachId", required = false) Long coachId, @RequestParam(value = "startTime", required = false) String startTime, @@ -152,4 +152,46 @@ public class DlDriveSchoolStudentController { } return success(schoolStudentService.indexGetTrainList(type,coachId,startTimeStr,endTimeStr)); } + + /** + * 查询自来学生列表 + * @author PQZ + * @date 11:41 2025/2/20 + * @param type 时间查询类型（01驾校统招，02教练自招，03自来客户） + * @param timeType 时间查询类型（all-全部|day-当日|month-当月|more-自定义） + * @param coachId 教练id + * @param startTime 查询时间范围--开始 + * @param endTime 查询时间范围--结束 + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult> + **/ + @GetMapping("/indexGetFormList") + @Operation(summary = "首页数据统计查询接口") + public CommonResult> indexGetFormList(@RequestParam(value = "type") String type, + @RequestParam(value = "timeType") String timeType, + @RequestParam(value = "coachId", required = false) Long coachId, + @RequestParam(value = "startTime", required = false) String startTime, + @RequestParam(value = "endTime", required = false) String endTime){ + //默认查全部数据 + String startTimeStr = ""; + String endTimeStr = ""; + if("more".equals(timeType)){ + if(StringUtils.isNotEmpty(startTime)){ + startTimeStr = startTime+" 00:00:01"; + } + if(StringUtils.isNotEmpty(endTime)) { + endTimeStr = endTime + " 23:59:59"; + } + }else if("month".equals(timeType)){ + //当月 + startTimeStr = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()),"yyyy-MM-dd")+" 00:00:01"; + endTimeStr = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()),"yyyy-MM-dd")+" 23:59:59"; + }else if("day".equals(timeType)){ + //当天 + startTimeStr = DateUtil.formatDate(DateUtil.date())+" 00:00:01"; + endTimeStr = DateUtil.formatDate(DateUtil.date())+" 23:59:59"; + } + return success(schoolStudentService.indexGetFormList(type,coachId,startTimeStr,endTimeStr)); + } + + } \ No newline at end of file diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolStudentMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolStudentMapper.java index b99fc710..ce8802e8 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolStudentMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolStudentMapper.java @@ -24,7 +24,7 @@ public interface DlDriveSchoolStudentMapper extends BaseMapper * @author PQZ * @date 10:44 2025/1/18 @@ -33,60 +33,66 @@ public interface DlDriveSchoolStudentMapper extends BaseMapper selectCanExamStudentList(@Param("courseId")String courseId,@Param("coachId")Long coachId - ,@Param("subject")Integer subject,@Param("userName")String userName); + **/ + List selectCanExamStudentList(@Param("courseId") String courseId, @Param("coachId") Long coachId + , @Param("subject") Integer subject, @Param("userName") String userName); /** * 手机端人员管理查询学员信息 + * + * @param staffVO {@link DlDriveSchoolStaffVO} + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage * @author PQZ * @date 14:48 2025/2/6 - * @param staffVO {@link DlDriveSchoolStaffVO} - * @param page 分页参数 - * @return com.baomidou.mybatisplus.core.metadata.IPage - **/ + **/ IPage pageStaffStudent(DlDriveSchoolStaffVO staffVO, Page page); /** * 教练查询自己的学生 + * + * @param pageReqVO TODO + * @param page TODO + * @return com.baomidou.mybatisplus.core.metadata.IPage * @author vinjor-M * @date 17:23 2025/2/12 - * @param pageReqVO TODO - * @param page TODO - * @return com.baomidou.mybatisplus.core.metadata.IPage - **/ + **/ IPage selectByCoachId(@Param("entity") DlDriveSchoolStudentVO pageReqVO, Page page); /** * 查学生列表---驾校层面查询 + * + * @param coachId 教练ID + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return java.util.List * @author vinjor-M * @date 15:13 2025/2/14 - * @param coachId 教练ID - * @param startTime 开始时间 - * @param endTime 结束时间 - * @return java.util.List - **/ - List selectStudentList(@Param("coachId")Long coachId, @Param("startTime") String startTime, @Param("endTime")String endTime); + **/ + List selectStudentList(@Param("coachId") Long coachId, @Param("startTime") String startTime, @Param("endTime") String endTime); /** * 教练层面查询自己的学生列表 + * * @author vinjor-M * @date 15:24 2025/2/17 - **/ - List selectStudentListCoach(@Param("coachId")Long coachId, @Param("startTime") String startTime, @Param("endTime")String endTime); + **/ + List selectStudentListCoach(@Param("coachId") Long coachId, @Param("startTime") String startTime, @Param("endTime") String endTime); /** * app首页查询训练学员---指定条件下 + * + * @param coachId 教练ID + * @param startTime 开始时间 + * @param endTime 截止时间 + * @return java.util.List * @author vinjor-M * @date 15:53 2025/2/19 - * @param coachId 教练ID - * @param startTime 开始时间 - * @param endTime 截止时间 - * @return java.util.List - **/ - IPage selectTrainStudent(@Param("coachId")Long coachId, @Param("startTime") String startTime, @Param("endTime")String endTime,@Param("searchValue")String searchValue, Page page); + **/ + IPage selectTrainStudent(@Param("coachId") Long coachId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("searchValue") String searchValue, Page page); /** * @param type 时间查询类型（01驾校统招，02教练自招，03自来客户） @@ -97,5 +103,16 @@ public interface DlDriveSchoolStudentMapper extends BaseMapper indexGetTrainList(@Param("type")String type, @Param("coachId")Long coachId, @Param("startTime")String startTime, @Param("endTime")String endTime); + List indexGetTrainList(@Param("type") String type, @Param("coachId") Long coachId, @Param("startTime") String startTime, @Param("endTime") String endTime); + + /** + * @param type 时间查询类型（01驾校统招，02教练自招，03自来客户） + * @param coachId 教练id + * @param startTime 查询时间范围--开始 + * @param endTime 查询时间范围--结束 + * @return java.util.List + * @author PQZ + * @date 11:54 2025/2/20 + **/ + List indexGetFormList(@Param("type") String type, @Param("coachId") Long coachId, @Param("startTime") String startTime, @Param("endTime") String endTime); } \ No newline at end of file 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 b30896be..3e997e4a 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 @@ -123,4 +123,16 @@ public interface DlDriveSchoolStudentService extends IService **/ List indexGetTrainList(String type, Long coachId, String startTime, String endTime); + + /** + * + * @author PQZ + * @date 11:43 2025/2/20 + * @param type 时间查询类型（01驾校统招，02教练自招，03自来客户） + * @param coachId 教练id + * @param startTimeStr 查询时间范围--开始 + * @param endTimeStr 查询时间范围--结束 + * @return cn.iocoder.yudao.module.base.vo.DlDriveSchoolStaffVO + **/ + List indexGetFormList(String type, Long coachId, 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 c7a9e9b5..501cc197 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 @@ -174,5 +174,19 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl indexGetFormList(String type, Long coachId, String startTimeStr, String endTimeStr) { + return dlDriveSchoolStudentMapper.indexGetFormList(type,coachId,startTimeStr,endTimeStr); + } + } \ No newline at end of file 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 affc982f..1064fda1 100644 --- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml @@ -178,4 +178,29 @@ ORDER BY totalNum ASC; + \ No newline at end of file