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

增加备注

Browse Source
This commit is contained in:
zhuchunyun 2024-08-28 19:14:39 +08:00
parent 4e5cdfb216
commit 81e21ea6da
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolReservationCourseController.java
View File

@ -182,9 +182,9 @@ public class DriveSchoolReservationCourseController extends BaseController
* 获取首页预约记录 * 获取首页预约记录
*/ */
@GetMapping(value = "/applet/getReservationCourseList") @GetMapping(value = "/applet/getReservationCourseList")
public CommonResult getReservationCourseList() public CommonResult getReservationCourseList(@RequestParam(required = false,defaultValue = "1") Integer pageNum,@RequestParam(required = false,defaultValue = "10") Integer pageSize)
{ { Page page =new Page(pageNum,pageSize);
return success(driveSchoolReservationCourseService.getReservationCourseList()); return success(driveSchoolReservationCourseService.getReservationCourseList(page));
} }
/** /**

2
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolReservationCourseMapper.java
View File

@ -82,7 +82,7 @@ public interface DriveSchoolReservationCourseMapper
Integer getPaydNumber(Long deptId); Integer getPaydNumber(Long deptId);
Integer getSignedNumber(Long deptId); Integer getSignedNumber(Long deptId);
List<DriveSchoolReservationCourse> getReservationCourseList(Long deptId); IPage<DriveSchoolReservationCourse> getReservationCourseList(Page page,@Param("deptId") Long deptId);
public List<DriveSchoolReservationCourse> selectDriveSchoolReservationGetListUser(DriveSchoolReservationCourse driveSchoolReservationCourse); public List<DriveSchoolReservationCourse> selectDriveSchoolReservationGetListUser(DriveSchoolReservationCourse driveSchoolReservationCourse);

2
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolReservationCourseService.java
View File

@ -69,7 +69,7 @@ public interface IDriveSchoolReservationCourseService
StatisticsVo getHomeData(); StatisticsVo getHomeData();
List<DriveSchoolReservationCourse> getReservationCourseList(); IPage<DriveSchoolReservationCourse> getReservationCourseList(Page page);
List<DriveSchoolReservationCourse> selectDriveSchoolReservationGetListUser(DriveSchoolReservationCourse driveSchoolReservationCourse); List<DriveSchoolReservationCourse> selectDriveSchoolReservationGetListUser(DriveSchoolReservationCourse driveSchoolReservationCourse);

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

@ -471,12 +471,12 @@ public class DriveSchoolReservationCourseServiceImpl implements IDriveSchoolRese
} }
@Override @Override
public List<DriveSchoolReservationCourse> getReservationCourseList() { public IPage<DriveSchoolReservationCourse> getReservationCourseList(Page page) {
Long userId = SecurityFrameworkUtils.getLoginUserId(); Long userId = SecurityFrameworkUtils.getLoginUserId();
AdminUserRespDTO user = userApi.getUser(userId); AdminUserRespDTO user = userApi.getUser(userId);
Long deptId = user.getDeptId(); Long deptId = user.getDeptId();
List<DriveSchoolReservationCourse> reservationCourseList = driveSchoolReservationCourseMapper.getReservationCourseList(deptId); IPage<DriveSchoolReservationCourse> reservationCourseList = driveSchoolReservationCourseMapper.getReservationCourseList(page,deptId);
for (DriveSchoolReservationCourse driveSchoolReservationCourse : reservationCourseList) { for (DriveSchoolReservationCourse driveSchoolReservationCourse : reservationCourseList.getRecords()) {
AdminUserRespDTO sysUserData = userApi.getUser(userId); AdminUserRespDTO sysUserData = userApi.getUser(userId);
//SysUser sysUserData = sysUserMapper.findSysUserById(driveSchoolReservationCourse.getUserId()); //SysUser sysUserData = sysUserMapper.findSysUserById(driveSchoolReservationCourse.getUserId());