From 1c223c5feebfa5d1fa71b5fcdd29aa4af4d0d9a2 Mon Sep 17 00:00:00 2001 From: PQZ Date: Fri, 7 Feb 2025 11:23:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/admin/DlDriveSchoolCourseController.java | 2 +- .../iocoder/yudao/module/base/entity/DlDriveSchoolCourse.java | 2 +- .../base/service/impl/DlDriveSchoolCourseServiceImpl.java | 2 -- .../main/resources/mapper/base/DlDriveSchoolCourseMapper.xml | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java index d76bd312..30400320 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java @@ -69,7 +69,7 @@ public class DlDriveSchoolCourseController { * @date 22:24 2025/1/16 **/ @PostMapping("/save") - @Operation(summary = "创建驾校教练") + @Operation(summary = "保存课程信息") public CommonResult saveSchoolCoach(@Valid @RequestBody DlDriveSchoolCourseVO saveVO) { courseService.saveDriveSchoolCourse(saveVO); return success(true); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCourse.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCourse.java index 364650e8..48d60b74 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCourse.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCourse.java @@ -48,7 +48,7 @@ public class DlDriveSchoolCourse extends TenantBaseDO { */ private String name; /** - * 课程名字 + * 小程序宣传标语 */ private String tittle; 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 6c139871..2a540d52 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 @@ -3,11 +3,9 @@ package cn.iocoder.yudao.module.base.service.impl; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 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; -import cn.iocoder.yudao.module.jx.core.page.TenantBaDO; import cn.iocoder.yudao.module.jx.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml index 475477f6..9039502a 100644 --- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml @@ -16,6 +16,7 @@ main.deleted = 0 and main.name like concat('%', #{entity.name}, '%') + and main.type = #{entity.type} order by main.create_time desc From 64927cecf026f18df1763c2507d31b86a8652e63 Mon Sep 17 00:00:00 2001 From: PQZ Date: Fri, 7 Feb 2025 16:51:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E6=95=99=E7=BB=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DlDriveSchoolCoachController.java | 23 ++++- .../service/DlDriveSchoolCoachService.java | 21 +++++ .../impl/DlDriveSchoolCoachServiceImpl.java | 37 ++++++++ .../admin/DriveSchoolCarController.java | 4 +- .../module/jx/domain/DriveSchoolCar.java | 6 ++ .../jx/mapper/DriveSchoolCarMapper.java | 27 +----- .../jx/service/IDriveSchoolCarService.java | 5 +- .../impl/DriveSchoolCarServiceImpl.java | 49 +++++------ .../mapper/jx/DriveSchoolCarMapper.xml | 86 +------------------ 9 files changed, 113 insertions(+), 145 deletions(-) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java index f2358325..efd06004 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCoachController.java @@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.List; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 驾校教练") @@ -48,6 +50,20 @@ public class DlDriveSchoolCoachController { 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 = "不分页获取教练信息") + public CommonResult> listSchoolCoach(DlDriveSchoolCoachPageReqVO pageReqVO) { + return success(dlDriveSchoolCoachService.listSchoolCoach(pageReqVO)); + } + /** * 保存驾校教练 * @@ -81,11 +97,12 @@ public class DlDriveSchoolCoachController { /** * 通过教练id获取驾校教练 - * @author PQZ - * @date 21:41 2025/1/16 + * * @param id 教练id * @return cn.iocoder.yudao.framework.common.pojo.CommonResult - **/ + * @author PQZ + * @date 21:41 2025/1/16 + **/ @GetMapping("/get") @Operation(summary = "获得驾校教练") @Parameter(name = "id", description = "编号", required = true, example = "1024") 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 6ac4c5aa..f33eb53b 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import javax.validation.Valid; +import java.util.List; /** * 驾校教练 Service 接口 @@ -26,6 +27,16 @@ public interface DlDriveSchoolCoachService extends IService **/ IPage queryListPage(DlDriveSchoolCoachPageReqVO pageReqVO, Page page); + /** + * 不分页查询教练信息 + * + * @param pageReqVO {@link DlDriveSchoolCoachPageReqVO} + * @return java.util.List + * @author PQZ + * @date 14:26 2025/2/7 + **/ + List listSchoolCoach(DlDriveSchoolCoachPageReqVO pageReqVO); + /** * @param staffVO {@link DlDriveSchoolStaffVO} * @param page 分页参数 @@ -43,6 +54,16 @@ public interface DlDriveSchoolCoachService extends IService **/ void saveSchoolCoach(@Valid DlDriveSchoolCoachSaveReqVO createReqVO); + /** + * 跟新教练员车辆信息 + * + * @param id id + * @param carNo 车辆 + * @author PQZ + * @date 15:51 2025/2/7 + **/ + void updateSchoolCoachCarId(String id, String carNo); + /** * 删除驾校教练 * 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 8a1d2cc3..e745edc9 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 @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.base.service.impl; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach; import cn.iocoder.yudao.module.base.mapper.DlDriveSchoolCoachMapper; import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachService; @@ -8,10 +9,12 @@ import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachPageReqVO; import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachRespVO; import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachSaveReqVO; import cn.iocoder.yudao.module.base.vo.DlDriveSchoolStaffVO; +import cn.iocoder.yudao.module.jx.utils.StringUtils; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.system.api.user.dto.UserDTO; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -22,6 +25,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.HashSet; +import java.util.List; import java.util.Set; import static cn.iocoder.yudao.common.BaseConstants.PASSWORD_DEFAULT; @@ -58,6 +62,24 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl + * @author PQZ + * @date 14:26 2025/2/7 + **/ + @Override + public List listSchoolCoach(DlDriveSchoolCoachPageReqVO pageReqVO) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(BaseDO::getDeleted,0).eq(DlDriveSchoolCoach::getType,"jl"); + if (StringUtils.isNotEmpty(pageReqVO.getName())){ + lambdaQueryWrapper.like(DlDriveSchoolCoach::getName,pageReqVO.getName()); + } + return list(lambdaQueryWrapper); + } + /** * @param staffVO {@link DlDriveSchoolStaffVO} * @param page 分页参数 @@ -113,6 +135,21 @@ public class DlDriveSchoolCoachServiceImpl extends ServiceImpl> list(DriveSchoolCar driveSchoolCar) { - driveSchoolCar.setPageNum(1); - driveSchoolCar.setPageSize(10); Page page = new Page<>(driveSchoolCar.getPageNum(), driveSchoolCar.getPageSize()); - IPage driveSchoolCarIPage = driveSchoolCarService.selectDriveSchoolCarList(driveSchoolCar, page); + IPage driveSchoolCarIPage = driveSchoolCarService.selectDriveSchoolCarList(page,driveSchoolCar); return CommonResult.success(driveSchoolCarIPage); //return getDataTable(list); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java index df52b0db..bbc34e21 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/domain/DriveSchoolCar.java @@ -70,6 +70,12 @@ public class DriveSchoolCar extends TenantBaDO @Excel(name = "手机号") private String userPhone; + /** 教练员用户id */ + private String userId; + + /** 教练id */ + private String coachId; + /** 车辆所有人 1：驾校 2：教练 3：其他 */ @Excel(name = "车辆所有人") private String carBlong; diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarMapper.java index a556ad5a..12bf7af6 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolCarMapper.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.jx.mapper; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCar; +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; @@ -15,7 +16,7 @@ import java.util.List; * @date 2024-05-08 */ @Mapper -public interface DriveSchoolCarMapper +public interface DriveSchoolCarMapper extends BaseMapper { /** * 查询车辆信息 @@ -34,30 +35,6 @@ public interface DriveSchoolCarMapper public IPage selectDriveSchoolCarList(@Param("entity") DriveSchoolCar driveSchoolCar, Page page); public List selectDriveSchoolCarListAll(@Param("entity") DriveSchoolCar driveSchoolCar); - /** - * 新增车辆信息 - * - * @param driveSchoolCar 车辆信息 - * @return 结果 - */ - public int insertDriveSchoolCar(DriveSchoolCar driveSchoolCar); - - /** - * 修改车辆信息 - * - * @param driveSchoolCar 车辆信息 - * @return 结果 - */ - public int updateDriveSchoolCar(DriveSchoolCar driveSchoolCar); - - /** - * 删除车辆信息 - * - * @param id 车辆信息主键 - * @return 结果 - */ - public int deleteDriveSchoolCarById(Long id); - /** * 批量删除车辆信息 * diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarService.java index b04e923f..b601d6e8 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolCarService.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.jx.service; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCar; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; * @author ruoyi * @date 2024-05-08 */ -public interface IDriveSchoolCarService +public interface IDriveSchoolCarService extends IService { /** * 查询车辆信息 @@ -28,7 +29,7 @@ public interface IDriveSchoolCarService * @param driveSchoolCar 车辆信息 * @return 车辆信息集合 */ - public IPage selectDriveSchoolCarList(DriveSchoolCar driveSchoolCar, Page page); + public IPage selectDriveSchoolCarList(Page page,DriveSchoolCar driveSchoolCar); public List selectDriveSchoolCarListAll(DriveSchoolCar driveSchoolCar); /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarServiceImpl.java index 79f8e1c3..cfbd5362 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCarServiceImpl.java @@ -1,19 +1,18 @@ package cn.iocoder.yudao.module.jx.service.impl; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.module.jx.utils.DateUtils; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachService; import cn.iocoder.yudao.module.jx.domain.DriveSchoolCar; import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCarMapper; import cn.iocoder.yudao.module.jx.service.IDriveSchoolCarService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.thoughtworks.xstream.core.SecurityUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @@ -26,13 +25,12 @@ import java.util.List; * @date 2024-05-08 */ @Service -public class DriveSchoolCarServiceImpl implements IDriveSchoolCarService +public class DriveSchoolCarServiceImpl extends ServiceImpl implements IDriveSchoolCarService { @Autowired private DriveSchoolCarMapper driveSchoolCarMapper; - @Resource - private AdminUserApi userApi; + private DlDriveSchoolCoachService coachService; /** * 查询车辆信息 @@ -53,22 +51,14 @@ public class DriveSchoolCarServiceImpl implements IDriveSchoolCarService * @return 车辆信息 */ @Override - public IPage selectDriveSchoolCarList(DriveSchoolCar driveSchoolCar, Page page) + public IPage selectDriveSchoolCarList(Page page,DriveSchoolCar driveSchoolCar) { - Long userId = SecurityFrameworkUtils.getLoginUserId(); - AdminUserRespDTO user = userApi.getUser(userId); - Long deptId = user.getDeptId(); - driveSchoolCar.setDeptId(deptId); return driveSchoolCarMapper.selectDriveSchoolCarList(driveSchoolCar,page); } @Override public List selectDriveSchoolCarListAll(DriveSchoolCar driveSchoolCar) { - Long userId = SecurityFrameworkUtils.getLoginUserId(); - AdminUserRespDTO user = userApi.getUser(userId); - Long deptId = user.getDeptId(); - driveSchoolCar.setDeptId(deptId); return driveSchoolCarMapper.selectDriveSchoolCarListAll(driveSchoolCar); } @@ -79,17 +69,17 @@ public class DriveSchoolCarServiceImpl implements IDriveSchoolCarService * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int insertDriveSchoolCar(DriveSchoolCar driveSchoolCar) { DriveSchoolCar driveSchoolCar1 = driveSchoolCarMapper.selectByCarNo(driveSchoolCar.getCarNo()); if (ObjectUtils.isNotEmpty(driveSchoolCar1)){ throw new RuntimeException("该车牌的车辆已存在！"); } - Long userId = SecurityFrameworkUtils.getLoginUserId(); - AdminUserRespDTO user = userApi.getUser(userId); - Long deptId = user.getDeptId(); - driveSchoolCar.setDeptId(deptId); - return driveSchoolCarMapper.insertDriveSchoolCar(driveSchoolCar); + if (StringUtils.isNotEmpty(driveSchoolCar.getCoachId())){ + coachService.updateSchoolCoachCarId(driveSchoolCar.getCoachId(), driveSchoolCar.getCarNo()); + } + return driveSchoolCarMapper.insert(driveSchoolCar); } /** @@ -99,10 +89,13 @@ public class DriveSchoolCarServiceImpl implements IDriveSchoolCarService * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int updateDriveSchoolCar(DriveSchoolCar driveSchoolCar) { - //driveSchoolCar.setUpdateTime(DateUtils.getNowDate()); - return driveSchoolCarMapper.updateDriveSchoolCar(driveSchoolCar); + if (StringUtils.isNotEmpty(driveSchoolCar.getCoachId())){ + coachService.updateSchoolCoachCarId(driveSchoolCar.getCoachId(), driveSchoolCar.getCarNo()); + } + return driveSchoolCarMapper.updateById(driveSchoolCar); } /** @@ -126,7 +119,7 @@ public class DriveSchoolCarServiceImpl implements IDriveSchoolCarService @Override public int deleteDriveSchoolCarById(Long id) { - return driveSchoolCarMapper.deleteDriveSchoolCarById(id); + return driveSchoolCarMapper.deleteById(id); } @Override @@ -139,7 +132,7 @@ public class DriveSchoolCarServiceImpl implements IDriveSchoolCarService for (DriveSchoolCar driveSchoolCar : carsList) { DriveSchoolCar driveSchoolCar1 = driveSchoolCarMapper.selectByCarNo(driveSchoolCar.getCarNo()); if (ObjectUtils.isEmpty(driveSchoolCar1)){ - driveSchoolCarMapper.insertDriveSchoolCar(driveSchoolCar); + driveSchoolCarMapper.insert(driveSchoolCar); successNum++; }else { failureNum++; diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml index b892421e..693dc226 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml @@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -38,7 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" deleted = 0 - and dept_id = #{entity.deptId} and brand = #{entity.brand} and car_model = #{entity.carModel} and car_no = #{entity.carNo} @@ -60,7 +61,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" deleted = 0 - and dept_id = #{entity.deptId} and brand = #{entity.brand} and car_model = #{entity.carModel} and car_no = #{entity.carNo} @@ -83,90 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - insert into drive_school_car - - dept_id, - brand, - car_model, - car_no, - car_photo, - car_register_date, - inspection_date, - user_name, - user_phone, - car_blong, - driving_licence, - operation_certificate, - outline_date, - repair_date, - create_time, - creator, - update_time, - updater, - baoxian_sttime, - baoxian_entime, - company, - content, - - - #{deptId}, - #{brand}, - #{carModel}, - #{carNo}, - #{carPhoto}, - #{carRegisterDate}, - #{inspectionDate}, - #{userName}, - #{userPhone}, - #{carBlong}, - #{drivingLicence}, - #{operationCertificate}, - #{outlineDate}, - #{repairDate}, - #{createTime}, - #{creator}, - #{updateTime}, - #{updater}, - #{baoxianSttime}, - #{baoxianEntime}, - #{company}, - #{content}, - - - - update drive_school_car - - dept_id = #{deptId}, - brand = #{brand}, - car_model = #{carModel}, - car_no = #{carNo}, - car_photo = #{carPhoto}, - car_register_date = #{carRegisterDate}, - inspection_date = #{inspectionDate}, - user_name = #{userName}, - user_phone = #{userPhone}, - car_blong = #{carBlong}, - driving_licence = #{drivingLicence}, - operation_certificate = #{operationCertificate}, - outline_date = #{outlineDate}, - repair_date = #{repairDate}, - create_time = #{createTime}, - creator = #{creator}, - update_time = #{updateTime}, - updater = #{updater}, - baoxian_sttime = #{baoxianSttime}, - baoxian_entime = #{baoxianEntime}, - company = #{company}, - content = #{content}, - - where id = #{id} - - - delete from drive_school_car where id = #{id} - delete from drive_school_car where id in From a713c8f862e383f68d2295cfd8dd03dfcefe1dfb Mon Sep 17 00:00:00 2001 From: PQZ Date: Fri, 7 Feb 2025 18:12:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=95=99=E7=BB=83=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/entity/DlDriveSchoolCoachCourse.java | 4 + .../DlDriveSchoolCoachCourseMapper.java | 16 ++++ .../DlDriveSchoolCoachCourseService.java | 36 +++++++++ .../DlDriveSchoolCoachCourseServiceImpl.java | 74 +++++++++++++++++++ .../impl/DlDriveSchoolCourseServiceImpl.java | 7 +- .../module/base/vo/DlDriveSchoolCoachVO.java | 17 +++++ .../module/base/vo/DlDriveSchoolCourseVO.java | 3 + 7 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCoachCourseMapper.java create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachCourseService.java create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachCourseServiceImpl.java create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolCoachVO.java 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 index b0959dd6..011df7e1 100644 --- 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 @@ -33,6 +33,10 @@ public class DlDriveSchoolCoachCourse extends TenantBaseDO { * 教练名称 */ private String coachName; + /** + * 教练联系方式 + */ + private String coachPhone; /** * 课程id */ diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCoachCourseMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCoachCourseMapper.java new file mode 100644 index 00000000..9dffa491 --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolCoachCourseMapper.java @@ -0,0 +1,16 @@ +package cn.iocoder.yudao.module.base.mapper; + +import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoachCourse; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 驾校教练 Mapper + * + * @author pqz + */ +@Mapper +public interface DlDriveSchoolCoachCourseMapper extends BaseMapper { + + +} \ No newline at end of file diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachCourseService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachCourseService.java new file mode 100644 index 00000000..50b090fb --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolCoachCourseService.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.base.service; + +import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach; +import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoachCourse; +import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachVO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * 驾校教练 Service 接口 + * + * @author pqz + */ +public interface DlDriveSchoolCoachCourseService extends IService { + + /** + * 保存课程与教练关联关系 + * + * @param courseId 课程id + * @param courseName 课程名称 + * @param courseType 教练类型 + * @param coachList 教练集合 + * @author PQZ + * @date 17:14 2025/2/7 + **/ + void saveCoachCourse(String courseId, String courseName, String courseType, List coachList); + + /** + * 通过课程id删除课程与教练关联关系 + * @author PQZ + * @date 17:35 2025/2/7 + * @param courseId 课程id + **/ + void removeByCourseId(String courseId); +} \ No newline at end of file diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachCourseServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachCourseServiceImpl.java new file mode 100644 index 00000000..bdb951be --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCoachCourseServiceImpl.java @@ -0,0 +1,74 @@ +package cn.iocoder.yudao.module.base.service.impl; + +import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach; +import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoachCourse; +import cn.iocoder.yudao.module.base.mapper.DlDriveSchoolCoachCourseMapper; +import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachCourseService; +import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachVO; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.util.ArrayList; +import java.util.List; + +/** + * 驾校教练 Service 实现类 + * + * @author pqz + */ +@Service +@Validated +public class DlDriveSchoolCoachCourseServiceImpl extends ServiceImpl implements DlDriveSchoolCoachCourseService { + + /** + * 保存课程与教练关联关系 + * + * @param courseId 课程id + * @param courseName 课程名称 + * @param courseType 教练类型 + * @param coachList 教练集合 + * @author PQZ + * @date 17:14 2025/2/7 + **/ + @Override + @Transactional(rollbackFor = Exception.class) + public void saveCoachCourse(String courseId, String courseName, String courseType, List coachList) { + List saveList = new ArrayList<>(); + //删除与课程关联的教练 + removeByCourseId(courseId); + //初始化教练与课程关联数据 + if (!coachList.isEmpty()){ + coachList.forEach(item -> { + DlDriveSchoolCoachCourse coachCourse = new DlDriveSchoolCoachCourse(); + coachCourse.setCoachId(item.getCoachId()); + coachCourse.setCoachName(item.getCoachName()); + coachCourse.setCoachPhone(item.getCoachPhone()); + //教练在本课程中的任教科目 + coachCourse.setSubject(item.getSubject()); + coachCourse.setCourseId(courseId); + coachCourse.setCourseName(courseName); + coachCourse.setCourseType(courseType); + saveList.add(coachCourse); + }); + } + //批量保存 + saveBatch(saveList); + } + + /** + * 通过课程id删除课程与教练关联关系 + * + * @param courseId 课程id + * @author PQZ + * @date 17:35 2025/2/7 + **/ + @Override + public void removeByCourseId(String courseId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(DlDriveSchoolCoachCourse::getCourseId,courseId); + remove(lambdaQueryWrapper); + } +} \ 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 2a540d52..13a220ee 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 @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCourse; import cn.iocoder.yudao.module.base.mapper.DlDriveSchoolCourseMapper; +import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachCourseService; import cn.iocoder.yudao.module.base.service.DlDriveSchoolCourseService; import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCourseVO; import cn.iocoder.yudao.module.jx.utils.StringUtils; @@ -28,6 +29,8 @@ public class DlDriveSchoolCourseServiceImpl extends ServiceImpl coachList; + }