From c62b724b90f3c468056a3a3fad19adbdf907e20c Mon Sep 17 00:00:00 2001 From: Vinjor Date: Thu, 27 Feb 2025 17:34:02 +0800 Subject: [PATCH] 1 --- .../admin/DlDriveSchoolStudentController.java | 8 ++--- .../mapper/DlDriveSchoolStudentMapper.java | 15 +++++++-- .../service/DlDriveSchoolStudentService.java | 6 ++-- .../impl/DlDriveSchoolStudentServiceImpl.java | 14 +++++--- .../module/base/vo/DlDriveSchoolStaffVO.java | 2 ++ .../base/DlDriveSchoolStudentMapper.xml | 33 +++++++++++++------ 6 files changed, 50 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 b2742c90..f0e5173d 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 @@ -157,18 +157,14 @@ public class DlDriveSchoolStudentController { * 查询自来学生列表 * @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, + public CommonResult> indexGetFormList(@RequestParam(value = "timeType") String timeType, @RequestParam(value = "startTime", required = false) String startTime, @RequestParam(value = "endTime", required = false) String endTime){ //默认查全部数据 @@ -190,7 +186,7 @@ public class DlDriveSchoolStudentController { startTimeStr = DateUtil.formatDate(DateUtil.date())+" 00:00:01"; endTimeStr = DateUtil.formatDate(DateUtil.date())+" 23:59:59"; } - return success(schoolStudentService.indexGetFormList(type,coachId,startTimeStr,endTimeStr)); + return success(schoolStudentService.indexGetFormList(startTimeStr,endTimeStr)); } 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 fe65e14a..57bd7c43 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 @@ -116,13 +116,22 @@ public interface DlDriveSchoolStudentMapper extends BaseMapper 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); + List indexGetFormList( @Param("startTime") String startTime, @Param("endTime") String endTime); + + /** + * 首页查询自来的学生 + * @author vinjor-M + * @date 15:55 2025/2/26 + * @param startTime TODO + * @param endTime TODO + * @return java.util.List + **/ + List indexCusStudentList(String startTime, 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 3e997e4a..b3cad31e 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 @@ -125,14 +125,12 @@ public interface DlDriveSchoolStudentService extends IService 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); + List 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 d390882d..b8fc7baf 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 @@ -170,12 +170,16 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl indexGetTrainList(String type, Long coachId, String startTime, String endTime) { - return dlDriveSchoolStudentMapper.indexGetTrainList(type,coachId,startTime,endTime); + if("03".equals(type)){ + //自来的学生 + return dlDriveSchoolStudentMapper.indexCusStudentList(startTime,endTime); + }else{ + return dlDriveSchoolStudentMapper.indexGetTrainList(type,coachId,startTime,endTime); + } } /** - * @param type 时间查询类型（01驾校统招，02教练自招，03自来客户） - * @param coachId 教练id + * 查自来客户 * @param startTimeStr 查询时间范围--开始 * @param endTimeStr 查询时间范围--结束 * @return cn.iocoder.yudao.module.base.vo.DlDriveSchoolStaffVO @@ -183,8 +187,8 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl indexGetFormList(String type, Long coachId, String startTimeStr, String endTimeStr) { - return dlDriveSchoolStudentMapper.indexGetFormList(type,coachId,startTimeStr,endTimeStr); + public List indexGetFormList(String startTimeStr, String endTimeStr) { + return dlDriveSchoolStudentMapper.indexGetFormList(startTimeStr,endTimeStr); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStaffVO.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStaffVO.java index be8f6501..cbb47789 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStaffVO.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStaffVO.java @@ -43,6 +43,8 @@ public class DlDriveSchoolStaffVO { private String sort; /**教练ID*/ private Long coachId; + /**招生的教练ID*/ + private Long sourceCoachId; /**查询时间范围--开始*/ private String startTime; /**查询时间范围--结束*/ 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 36c61123..a048c36d 100644 --- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml @@ -67,6 +67,9 @@ AND dsp.coach_id = #{entity.coachId} + + AND main.source_user_id = #{entity.sourceCoachId} + AND main.name LIKE CONCAT('%',#{entity.name},'%') @@ -204,6 +207,7 @@ + \ No newline at end of file