dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:a4d7ebc849ca5c3fbb920529327475b2622afe89
Branches Tags
dianliang:master
dianliang:driver
dianliang:insp
dianliang:repair
dianliang:dev
..
compare: dianliang:e2111c6d12743882110ad278776b6ea0803000fa
Branches Tags
dianliang:driver
dianliang:insp
dianliang:master
dianliang:repair
dianliang:dev

No commits in common. "a4d7ebc849ca5c3fbb920529327475b2622afe89" and "e2111c6d12743882110ad278776b6ea0803000fa" have entirely different histories.
a4d7ebc849 ... e2111c6d12

6 changed files with 14 additions and 14 deletions
Show Stats Expand all files Collapse all files

4
dl-module-jx/src/main/java/cn/iocoder/yudao/module/appBase/controller/DriveSchoolCoachAppletController.java
View File

@ -19,7 +19,7 @@ import java.util.List;
* @date 2024-03-29
*/
@RestController
@RequestMapping("/admin-api/drivingSchool/applet/schoolCoach")
@RequestMapping("/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<DriveSchoolCoach> list = driveSchoolCoachService.selectDriveSchoolCoachListAll(driveSchoolCoach);

3
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DrivePayServiceImpl.java
View File

@ -280,9 +280,6 @@ 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)){

10
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolCourseServiceImpl.java
View File

@ -71,11 +71,13 @@ public class DriveSchoolCourseServiceImpl implements IDriveSchoolCourseService
@Override
public IPage<DriveSchoolCourse> selectDriveSchoolCourseList(DriveSchoolCourse driveSchoolCourse, Page<DriveSchoolCourse> page)
{
Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
Long userId = SecurityFrameworkUtils.getLoginUserId();
AdminUserRespDTO user = userApi.getUser(userId);
Long deptId = user.getDeptId();
driveSchoolCourse.setDeptId(deptId);
// if (deptId == 100){
// driveSchoolCourse.setDeptId(null);
// }
if (deptId == 100){
driveSchoolCourse.setDeptId(null);
}
IPage<DriveSchoolCourse> driveSchoolCourseIPage = driveSchoolCourseMapper.selectDriveSchoolCourseList(driveSchoolCourse, page);
List<DriveSchoolCourse> driveSchoolCourses = driveSchoolCourseIPage.getRecords();
for (DriveSchoolCourse driveSchoolCours : driveSchoolCourses) {

4
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolFeedbackServiceImpl.java
View File

@ -108,13 +108,15 @@ 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 RuntimeException("请先报名！");
throw new Exception("请先报名！");
}
driveSchoolFeedback.setUserId(userId);
driveSchoolFeedback.setJlId(driveSchoolPay.getJlId());

5
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolReservationCourseServiceImpl.java
View File

@ -276,13 +276,12 @@ 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()) && ObjectUtils.isNotEmpty(deptId1) && deptId1==100 && driveSchoolReservationCourse.getStuSignState().equals("1")){
if (ObjectUtils.isNotEmpty(driveSchoolReservationCourse) && ObjectUtils.isNotEmpty(driveSchoolReservationCourse.getStuSignState()) && deptId1==100 && driveSchoolReservationCourse.getStuSignState().equals("1")){
driveSchoolReservationCourse.setStuSigninTime(DateUtils.getNowDate());
driveSchoolReservationCourseMapper.updateDriveSchoolReservationCourse(driveSchoolReservationCourse);
}
if (ObjectUtils.isNotEmpty(driveSchoolReservationCourse) && ObjectUtils.isNotEmpty(driveSchoolReservationCourse.getStuSignState()) && ObjectUtils.isNotEmpty(deptId1) && deptId1==100 && driveSchoolReservationCourse.getStuSignState().equals("2")){
if (ObjectUtils.isNotEmpty(driveSchoolReservationCourse) && ObjectUtils.isNotEmpty(driveSchoolReservationCourse.getStuSignState()) && deptId1==100 && driveSchoolReservationCourse.getStuSignState().equals("2")){
driveSchoolReservationCourse.setStuSignoutTime(DateUtils.getNowDate());
driveSchoolReservationCourseMapper.updateDriveSchoolReservationCourse(driveSchoolReservationCourse);
Date tempStartTime = new Date();

2
dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCoachMapper.xml
View File

@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="entity.experienceYear != null "> and experience_year = #{entity.experienceYear}</if>
<if test="entity.instructorDesc != null and entity.instructorDesc != ''"> and instructor_desc = #{entity.instructorDesc}</if>
<if test="entity.subjectType != null and entity.subjectType != ''"> and subject_type like concat('%',#{entity.subjectType},'%')</if>
<if test="entity.drivingYear != null "> and driving_year = #{entity.drivingYear}</if>
<if test="entity.drivingYear != null "> and driving_year = #{drivingYear}</if>
<if test="entity.driveCardType != null and entity.driveCardType != ''"> and drive_card_type = #{entity.driveCardType}</if>
</where>
order by create_time desc