Compare commits

..

No commits in common. "254c983fdfeda4bae0e554d8698b44011be45f96" and "fd353a54d1527126b08e5fdc27740b03e13b5f6f" have entirely different histories.

6 changed files with 3 additions and 21 deletions

View File

@ -28,12 +28,6 @@ public class DriveSchoolCourseController extends BaseController
@GetMapping("/list")
public CommonResult<IPage<?>> list(DriveSchoolCourse driveSchoolCourse)
{
if(null == driveSchoolCourse.getPageNum()){
driveSchoolCourse.setPageNum(1);
}
if (null == driveSchoolCourse.getPageSize()){
driveSchoolCourse.setPageSize(100);
}
Page<DriveSchoolCourse> page = new Page<>(driveSchoolCourse.getPageNum(), driveSchoolCourse.getPageSize());
IPage<DriveSchoolCourse> driveSchoolCourseIPage = driveSchoolCourseService.selectDriveSchoolCourseList(driveSchoolCourse, page);
return CommonResult.success(driveSchoolCourseIPage);

View File

@ -29,12 +29,6 @@ public class DriveSchoolDynamicController extends BaseController
@GetMapping("/list")
public CommonResult<IPage<?>> list(DriveSchoolDynamic driveSchoolDynamic)
{
if(null == driveSchoolDynamic.getPageNum()){
driveSchoolDynamic.setPageNum(1);
}
if (null == driveSchoolDynamic.getPageSize()){
driveSchoolDynamic.setPageSize(100);
}
Page<DriveSchoolDynamic> page = new Page<>(driveSchoolDynamic.getPageNum(), driveSchoolDynamic.getPageSize());
IPage<DriveSchoolDynamic> driveSchoolDynamicIPage = driveSchoolDynamicService.selectDriveSchoolDynamicList(driveSchoolDynamic, page);
return CommonResult.success(driveSchoolDynamicIPage);

View File

@ -89,7 +89,7 @@ public class DriveSchoolFeedbackController extends BaseController
/**
* 删除反馈
*/
@DeleteMapping("/{ids}")
@DeleteMapping("/{ids}")
public CommonResult remove(@PathVariable Long[] ids)
{
return toAjax(driveSchoolFeedbackService.deleteDriveSchoolFeedbackByIds(ids));

View File

@ -42,12 +42,6 @@ public class DriveSchoolInfoController extends BaseController
@GetMapping("/list")
public CommonResult<IPage<?>> list(DriveSchoolInfo driveSchoolInfo)
{
if(null == driveSchoolInfo.getPageNum()){
driveSchoolInfo.setPageNum(1);
}
if (null == driveSchoolInfo.getPageSize()){
driveSchoolInfo.setPageSize(100);
}
Page<DriveSchoolInfo> page = new Page<>(driveSchoolInfo.getPageNum(), driveSchoolInfo.getPageSize());
IPage<DriveSchoolInfo> driveSchoolInfoIPage = driveSchoolInfoService.selectDriveSchoolInfoList(driveSchoolInfo, page);
return CommonResult.success(driveSchoolInfoIPage);

View File

@ -203,7 +203,7 @@ public class DriveSchoolReservationCourseController extends BaseController
public CommonResult getAppReservationCourseListByUserId(DriveSchoolReservationCourse driveSchoolReservationCourse)
{
return success(driveSchoolReservationCourseService.getAppReservationCourseListByUserId(driveSchoolReservationCourse));
}
}
/**
* app获取首页预约记录上

View File

@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDriveSchoolInfoVo"/>
<where>
deleted = 0
<if test="entity.id != null "> and id = #{entity.id}</if>
<if test="id != null "> and id = #{id}</if>
<if test="entity.deptId != null "> and dept_id = #{entity.deptId}</if>
<if test="entity.schoolName != null and entity.schoolName != ''"> and school_name like concat('%', #{entity.schoolName}, '%')</if>
<if test="entity.leaderName != null and entity.leaderName != ''"> and leader_name like concat('%', #{entity.leaderName}, '%')</if>