From f68dbfa414d7b5611ed82eb4c08ae7899baebb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=97=AD?= <2405973191@qq.com> Date: Sun, 1 Sep 2024 22:24:17 +0800 Subject: [PATCH] 11 --- .../controller/DriveSchoolCoachAppletController.java | 4 ++-- .../module/jx/service/impl/DrivePayServiceImpl.java | 3 +++ .../jx/service/impl/DriveSchoolCourseServiceImpl.java | 10 ++++------ .../service/impl/DriveSchoolFeedbackServiceImpl.java | 4 +--- .../impl/DriveSchoolReservationCourseServiceImpl.java | 5 +++-- .../resources/mapper/jx/DriveSchoolCoachMapper.xml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCoachAppletController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCoachAppletController.java index 365e566e..11126ace 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCoachAppletController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCoachAppletController.java @@ -19,7 +19,7 @@ import java.util.List; * @date 2024-03-29 */ @RestController -@RequestMapping("/drivingSchool/applet/schoolCoach") +@RequestMapping("/admin-api/drivingSchool/applet/schoolCoach") public class DriveSchoolCoachAppletController extends BaseController { @Autowired @@ -38,7 +38,7 @@ public class DriveSchoolCoachAppletController extends BaseController /** * 查询驾校教练列表(更多) */ - @GetMapping("/ListAll") + @GetMapping("/listAll") public CommonResult list(DriveSchoolCoach driveSchoolCoach) { List list = driveSchoolCoachService.selectDriveSchoolCoachListAll(driveSchoolCoach); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DrivePayServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DrivePayServiceImpl.java index 5e6786e3..8bf5c4af 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DrivePayServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DrivePayServiceImpl.java @@ -280,6 +280,9 @@ public class DrivePayServiceImpl implements DrivePayService { // LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); // String avatar = loginUser.getInfo().get("avatar"); AdminUserRespDTO sysUser = userApi.getUser(SecurityFrameworkUtils.getLoginUserId()); + if (ObjectUtils.isEmpty(sysUser)){ + throw new RuntimeException("请先登录！"); + } //SysUser sysUser = userService.selectUserById(SecurityFrameworkUtils.getLoginUserId()); PayVo payVo = drivePayMapper.findPayByUserId(SecurityFrameworkUtils.getLoginUserId()); if(ObjectUtils.isNotEmpty(payVo)){ diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java index 34efb90c..a6715a95 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java @@ -71,13 +71,11 @@ public class DriveSchoolCourseServiceImpl implements IDriveSchoolCourseService @Override public IPage selectDriveSchoolCourseList(DriveSchoolCourse driveSchoolCourse, Page page) { - Long userId = SecurityFrameworkUtils.getLoginUserId(); - AdminUserRespDTO user = userApi.getUser(userId); - Long deptId = user.getDeptId(); + Long deptId = SecurityFrameworkUtils.getLoginUserDeptId(); driveSchoolCourse.setDeptId(deptId); - if (deptId == 100){ - driveSchoolCourse.setDeptId(null); - } +// if (deptId == 100){ +// driveSchoolCourse.setDeptId(null); +// } IPage driveSchoolCourseIPage = driveSchoolCourseMapper.selectDriveSchoolCourseList(driveSchoolCourse, page); List driveSchoolCourses = driveSchoolCourseIPage.getRecords(); for (DriveSchoolCourse driveSchoolCours : driveSchoolCourses) { diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFeedbackServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFeedbackServiceImpl.java index 339832ca..29aacf76 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFeedbackServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFeedbackServiceImpl.java @@ -108,15 +108,13 @@ public class DriveSchoolFeedbackServiceImpl implements IDriveSchoolFeedbackServi @Override public int insertDriveSchoolFeedback(DriveSchoolFeedback driveSchoolFeedback) throws Exception { Long userId = SecurityFrameworkUtils.getLoginUserId(); -// Long userId = SecurityUtils.getUserId(); -// SysUser sysUser = sysUserMapper.selectUserById(userId); AdminUserRespDTO sysUser = userApi.getUser(userId); if(ObjectUtils.isNotEmpty(sysUser)){ driveSchoolFeedback.setUserName(sysUser.getNickname()); } DriveSchoolPay driveSchoolPay = driveSchoolPayService.selectByUserId(userId); if (ObjectUtils.isEmpty(driveSchoolPay)){ - throw new Exception("请先报名！"); + throw new RuntimeException("请先报名！"); } driveSchoolFeedback.setUserId(userId); driveSchoolFeedback.setJlId(driveSchoolPay.getJlId()); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java index d4cd3f62..2a5c5e74 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java @@ -276,12 +276,13 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese AdminUserRespDTO sysUser = userApi.getUser(userId); // SysUser sysUser = sysUserMapper.selectUserById(userId); Long deptId1 = sysUser.getDeptId(); + deptId1 = 100L; //更新学员签到签退时间 - if (ObjectUtils.isNotEmpty(driveSchoolReservationCourse) && ObjectUtils.isNotEmpty(driveSchoolReservationCourse.getStuSignState()) && deptId1==100 && driveSchoolReservationCourse.getStuSignState().equals("1")){ + if (ObjectUtils.isNotEmpty(driveSchoolReservationCourse) && ObjectUtils.isNotEmpty(driveSchoolReservationCourse.getStuSignState()) && ObjectUtils.isNotEmpty(deptId1) && deptId1==100 && driveSchoolReservationCourse.getStuSignState().equals("1")){ driveSchoolReservationCourse.setStuSigninTime(DateUtils.getNowDate()); driveSchoolReservationCourseMapper.updateDriveSchoolReservationCourse(driveSchoolReservationCourse); } - if (ObjectUtils.isNotEmpty(driveSchoolReservationCourse) && ObjectUtils.isNotEmpty(driveSchoolReservationCourse.getStuSignState()) && deptId1==100 && driveSchoolReservationCourse.getStuSignState().equals("2")){ + if (ObjectUtils.isNotEmpty(driveSchoolReservationCourse) && ObjectUtils.isNotEmpty(driveSchoolReservationCourse.getStuSignState()) && ObjectUtils.isNotEmpty(deptId1) && deptId1==100 && driveSchoolReservationCourse.getStuSignState().equals("2")){ driveSchoolReservationCourse.setStuSignoutTime(DateUtils.getNowDate()); driveSchoolReservationCourseMapper.updateDriveSchoolReservationCourse(driveSchoolReservationCourse); Date tempStartTime = new Date(); diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml index a0d24108..ca68db7b 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and experience_year = #{entity.experienceYear} and instructor_desc = #{entity.instructorDesc} and subject_type like concat('%',#{entity.subjectType},'%') - and driving_year = #{drivingYear} + and driving_year = #{entity.drivingYear} and drive_card_type = #{entity.driveCardType} order by create_time desc