diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCouseController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java similarity index 98% rename from dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCouseController.java rename to dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java index c5f21c01..d76bd312 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCouseController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java @@ -21,7 +21,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @RestController @RequestMapping("/base/dl-drive-school-course") @Validated -public class DlDriveSchoolCouseController { +public class DlDriveSchoolCourseController { @Resource private DlDriveSchoolCourseService courseService; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCoachCourse.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCoachCourse.java new file mode 100644 index 00000000..f8d3bdbe --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCoachCourse.java @@ -0,0 +1,41 @@ +package cn.iocoder.yudao.module.base.entity; + +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +/** + * 驾校教练 DO + * + * @author pqz + */ +@TableName("drive_school_coach_course") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DlDriveSchoolCoachCourse extends TenantBaseDO { + + /** + * 主键id + */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + /** + * 教练id + */ + private String coachId; + /** + * 课程id + */ + private String courseId; + /** + * 科目 + */ + private String subject; + +} \ No newline at end of file diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCourseMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCourseMapper.java index f802d85a..4d569fd5 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCourseMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCourseMapper.java @@ -1,8 +1,13 @@ package cn.iocoder.yudao.module.base.mapper; import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCourse; +import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachRespVO; +import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCourseVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 驾校课程Mapper @@ -11,6 +16,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface DlDriveSchoolCourseMapper extends BaseMapper { - + /** + * 分页查询驾校课程 + * + * @param entity {@link DlDriveSchoolCourseVO} + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage + * @author PQZ + * @date 7:10 2025/1/17 + **/ + IPage queryListPage(@Param("entity") DlDriveSchoolCourseVO entity, Page page); } \ No newline at end of file diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseServiceImpl.java index 424aa875..88fe0f5c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseServiceImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.base.service.impl; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCourse; +import cn.iocoder.yudao.module.base.mapper.DlDriveSchoolCoachMapper; import cn.iocoder.yudao.module.base.mapper.DlDriveSchoolCourseMapper; import cn.iocoder.yudao.module.base.service.DlDriveSchoolCourseService; import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCourseVO; @@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; import java.util.List; /** @@ -25,6 +27,8 @@ import java.util.List; @Validated public class DlDriveSchoolCourseServiceImpl extends ServiceImpl implements DlDriveSchoolCourseService { + @Resource + private DlDriveSchoolCourseMapper courseMapper; /** * 分页查询驾校课程 @@ -37,7 +41,7 @@ public class DlDriveSchoolCourseServiceImpl extends ServiceImpl queryListPage(DlDriveSchoolCourseVO pageReqVO, Page page) { - return null; + return courseMapper.queryListPage(pageReqVO,page); } /** diff --git a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml index e9e8ed70..2ae6b9ed 100644 --- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml @@ -17,8 +17,11 @@ main.deleted = 0 and main.type = #{entity.type} - and main.name like concat('%', #{entity.name}, '%') - and main.phone like concat('%', #{entity.phone}, '%') + and main.name like concat('%', #{entity.name}, '%') + + and main.phone like concat('%', #{entity.phone},'%') + + order by main.create_time desc \ No newline at end of file diff --git a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml new file mode 100644 index 00000000..475477f6 --- /dev/null +++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file