Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

This commit is contained in:
zhangchenbiao
2024-05-10 15:49:22 +08:00
16 changed files with 121 additions and 30 deletions

View File

@@ -70,12 +70,16 @@ public class EmployeeTrainingController {
@ApiOperation("培训-教练员-员工列表")
@PostMapping("/trainerUserList")
@GetMapping("/trainerUserList")
@ApiImplicitParams({
@ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成")
@ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成"),
@ApiImplicitParam(name = "pageNum", value = "分页页数"),
@ApiImplicitParam(name = "pageSize", value = "分页大小"),
})
public ResponseResult<List<EmployeeTrainingVO>> trainerUserList(@RequestParam(value = "status", required = false) Integer status) {
return ResponseResult.success(employeeTrainingService.trainerUserList(CurrentUserHolder.getUserId(), status));
public ResponseResult<PageInfo<EmployeeTrainingVO>> trainerUserList(@RequestParam(value = "status", required = false) Integer status,
@RequestParam(value = "pageNum" ,defaultValue = "1")Integer pageNum,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
return ResponseResult.success(employeeTrainingService.trainerUserList(CurrentUserHolder.getUserId(), status, pageNum, pageSize));
}
@ApiOperation("培训-教练员-员工带训详情")