Merge #27 into master from cc_20260116_fix
feat:实训数据去除 * cc_20260116_fix: (3 commits squashed) - feat:培训去掉身份证校验 - fix:带出新管家信息 - feat:实训数据去除 Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/27
This commit is contained in:
正新
@@ -28,113 +28,113 @@ import java.util.List;
|
||||
@RequestMapping("pc/employeeTraining")
|
||||
public class EmployeeTrainingController {
|
||||
|
||||
@Resource
|
||||
private EmployeeTrainingService employeeTrainingService;
|
||||
|
||||
|
||||
@ApiOperation("培训员工列表")
|
||||
@GetMapping("/trainingListByShopId")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
|
||||
})
|
||||
public ResponseResult<List<EmployeeTrainingVO>> trainingListByShopId(@RequestParam("shopId") Long shopId) {
|
||||
return ResponseResult.success(employeeTrainingService.trainingListByShopId(shopId));
|
||||
}
|
||||
|
||||
@ApiOperation("待训员工列表")
|
||||
@PostMapping("/employeeTrainingList")
|
||||
public ResponseResult<PageInfo<EmployeeTrainingVO>> employeeTrainingList(@RequestBody EmployeeTrainingRequest employeeTrainingRequest) {
|
||||
return ResponseResult.success(employeeTrainingService.employeeTrainingList(CurrentUserHolder.getUserId(), employeeTrainingRequest));
|
||||
}
|
||||
|
||||
@ApiOperation("员工培训详情")
|
||||
@GetMapping("/employeeTrainingDetail")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "id", value = "id", required = true)
|
||||
})
|
||||
public ResponseResult<EmployeeTrainingDetailVO> employeeTrainingDetail(@RequestParam("id") Long id) {
|
||||
return ResponseResult.success(employeeTrainingService.employeeTrainingDetail(id));
|
||||
}
|
||||
|
||||
@ApiOperation("员工培训--分配")
|
||||
@PostMapping("/distribution")
|
||||
public ResponseResult<Boolean> distribution(@RequestBody EmployeeTrainingDetailRequest request) {
|
||||
employeeTrainingService.distribution(request);
|
||||
return ResponseResult.success(Boolean.TRUE);
|
||||
}
|
||||
|
||||
@ApiOperation("培训进度-列表")
|
||||
@PostMapping("/trainingScheduleList")
|
||||
public ResponseResult<PageInfo<EmployeeTrainingVO>> trainingScheduleList(@RequestBody EmployeeTrainingRequest employeeTrainingRequest) {
|
||||
employeeTrainingRequest.setAssignFlag(Boolean.TRUE);
|
||||
return ResponseResult.success(employeeTrainingService.employeeTrainingList(CurrentUserHolder.getUserId(), employeeTrainingRequest));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("培训-教练员-员工列表")
|
||||
@GetMapping("/trainerUserList")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成"),
|
||||
@ApiImplicitParam(name = "pageNum", value = "分页页数"),
|
||||
@ApiImplicitParam(name = "pageSize", value = "分页大小"),
|
||||
})
|
||||
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("培训-教练员-员工带训详情")
|
||||
@RequestMapping("/trainerUserDetail")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "id", value = "用户id", required = true)
|
||||
})
|
||||
public ResponseResult<EmployeeUserTrainingVO> trainerUserDetail(Long id) {
|
||||
return ResponseResult.success(employeeTrainingService.trainerUserDetail(id));
|
||||
}
|
||||
|
||||
@ApiOperation("培训-教练员-提交培训")
|
||||
@PostMapping("/trainerUserCommit")
|
||||
public ResponseResult<Boolean> trainerUserCommit(@RequestBody EmployeeTrainingCommitListRequest request) {
|
||||
employeeTrainingService.trainerUserCommit(request);
|
||||
return ResponseResult.success(Boolean.TRUE);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("培训-战区经理-考核员工列表")
|
||||
@PostMapping("/assessmentUserList")
|
||||
public ResponseResult<PageInfo<EmployeeTrainingVO>> assessmentUserList(@RequestBody EmployeeAssessmentRequest request) {
|
||||
return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
|
||||
}
|
||||
|
||||
@ApiOperation("培训-督导-考核员工列表")
|
||||
@PostMapping("/supervisorUserList")
|
||||
public ResponseResult<PageInfo<EmployeeTrainingVO>> supervisorUserList(@RequestBody EmployeeAssessmentRequest request) {
|
||||
return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
|
||||
}
|
||||
|
||||
@ApiOperation("培训-战区经理-员工考核详情")
|
||||
@RequestMapping("/assessmentUserDetail")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "id", value = "员工id", required = true)
|
||||
})
|
||||
public ResponseResult<AssessmentUserTrainingVO> assessmentUserDetail(Long id) {
|
||||
return ResponseResult.success(employeeTrainingService.assessmentUserDetail(id));
|
||||
}
|
||||
|
||||
@ApiOperation("培训-实训考核-转交")
|
||||
@PostMapping("/turn")
|
||||
public ResponseResult<Boolean> turn(@RequestBody EmployeeAssessmentTurnRequest request) {
|
||||
employeeTrainingService.turn(request.getId(), CurrentUserHolder.getUserId(), request.getTurnUserId());
|
||||
return ResponseResult.success(Boolean.TRUE);
|
||||
}
|
||||
|
||||
@ApiOperation("培训-实训考核-提交考核结果")
|
||||
@PostMapping("/assessmentUserCommit")
|
||||
public ResponseResult<Boolean> assessmentUserCommit(@RequestBody EmployeeAssessmentCommitListRequest request) {
|
||||
employeeTrainingService.assessmentUserCommit(request, CurrentUserHolder.getUser());
|
||||
return ResponseResult.success(Boolean.TRUE);
|
||||
}
|
||||
// @Resource
|
||||
// private EmployeeTrainingService employeeTrainingService;
|
||||
//
|
||||
//
|
||||
// @ApiOperation("培训员工列表")
|
||||
// @GetMapping("/trainingListByShopId")
|
||||
// @ApiImplicitParams({
|
||||
// @ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
|
||||
// })
|
||||
// public ResponseResult<List<EmployeeTrainingVO>> trainingListByShopId(@RequestParam("shopId") Long shopId) {
|
||||
// return ResponseResult.success(employeeTrainingService.trainingListByShopId(shopId));
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("待训员工列表")
|
||||
// @PostMapping("/employeeTrainingList")
|
||||
// public ResponseResult<PageInfo<EmployeeTrainingVO>> employeeTrainingList(@RequestBody EmployeeTrainingRequest employeeTrainingRequest) {
|
||||
// return ResponseResult.success(employeeTrainingService.employeeTrainingList(CurrentUserHolder.getUserId(), employeeTrainingRequest));
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("员工培训详情")
|
||||
// @GetMapping("/employeeTrainingDetail")
|
||||
// @ApiImplicitParams({
|
||||
// @ApiImplicitParam(name = "id", value = "id", required = true)
|
||||
// })
|
||||
// public ResponseResult<EmployeeTrainingDetailVO> employeeTrainingDetail(@RequestParam("id") Long id) {
|
||||
// return ResponseResult.success(employeeTrainingService.employeeTrainingDetail(id));
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("员工培训--分配")
|
||||
// @PostMapping("/distribution")
|
||||
// public ResponseResult<Boolean> distribution(@RequestBody EmployeeTrainingDetailRequest request) {
|
||||
// employeeTrainingService.distribution(request);
|
||||
// return ResponseResult.success(Boolean.TRUE);
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("培训进度-列表")
|
||||
// @PostMapping("/trainingScheduleList")
|
||||
// public ResponseResult<PageInfo<EmployeeTrainingVO>> trainingScheduleList(@RequestBody EmployeeTrainingRequest employeeTrainingRequest) {
|
||||
// employeeTrainingRequest.setAssignFlag(Boolean.TRUE);
|
||||
// return ResponseResult.success(employeeTrainingService.employeeTrainingList(CurrentUserHolder.getUserId(), employeeTrainingRequest));
|
||||
// }
|
||||
//
|
||||
//
|
||||
// @ApiOperation("培训-教练员-员工列表")
|
||||
// @GetMapping("/trainerUserList")
|
||||
// @ApiImplicitParams({
|
||||
// @ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成"),
|
||||
// @ApiImplicitParam(name = "pageNum", value = "分页页数"),
|
||||
// @ApiImplicitParam(name = "pageSize", value = "分页大小"),
|
||||
// })
|
||||
// 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("培训-教练员-员工带训详情")
|
||||
// @RequestMapping("/trainerUserDetail")
|
||||
// @ApiImplicitParams({
|
||||
// @ApiImplicitParam(name = "id", value = "用户id", required = true)
|
||||
// })
|
||||
// public ResponseResult<EmployeeUserTrainingVO> trainerUserDetail(Long id) {
|
||||
// return ResponseResult.success(employeeTrainingService.trainerUserDetail(id));
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("培训-教练员-提交培训")
|
||||
// @PostMapping("/trainerUserCommit")
|
||||
// public ResponseResult<Boolean> trainerUserCommit(@RequestBody EmployeeTrainingCommitListRequest request) {
|
||||
// employeeTrainingService.trainerUserCommit(request);
|
||||
// return ResponseResult.success(Boolean.TRUE);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// @ApiOperation("培训-战区经理-考核员工列表")
|
||||
// @PostMapping("/assessmentUserList")
|
||||
// public ResponseResult<PageInfo<EmployeeTrainingVO>> assessmentUserList(@RequestBody EmployeeAssessmentRequest request) {
|
||||
// return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("培训-督导-考核员工列表")
|
||||
// @PostMapping("/supervisorUserList")
|
||||
// public ResponseResult<PageInfo<EmployeeTrainingVO>> supervisorUserList(@RequestBody EmployeeAssessmentRequest request) {
|
||||
// return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("培训-战区经理-员工考核详情")
|
||||
// @RequestMapping("/assessmentUserDetail")
|
||||
// @ApiImplicitParams({
|
||||
// @ApiImplicitParam(name = "id", value = "员工id", required = true)
|
||||
// })
|
||||
// public ResponseResult<AssessmentUserTrainingVO> assessmentUserDetail(Long id) {
|
||||
// return ResponseResult.success(employeeTrainingService.assessmentUserDetail(id));
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("培训-实训考核-转交")
|
||||
// @PostMapping("/turn")
|
||||
// public ResponseResult<Boolean> turn(@RequestBody EmployeeAssessmentTurnRequest request) {
|
||||
// employeeTrainingService.turn(request.getId(), CurrentUserHolder.getUserId(), request.getTurnUserId());
|
||||
// return ResponseResult.success(Boolean.TRUE);
|
||||
// }
|
||||
//
|
||||
// @ApiOperation("培训-实训考核-提交考核结果")
|
||||
// @PostMapping("/assessmentUserCommit")
|
||||
// public ResponseResult<Boolean> assessmentUserCommit(@RequestBody EmployeeAssessmentCommitListRequest request) {
|
||||
// employeeTrainingService.assessmentUserCommit(request, CurrentUserHolder.getUser());
|
||||
// return ResponseResult.success(Boolean.TRUE);
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -27,13 +27,13 @@ public class MiniEmployeeTrainingController {
|
||||
@Resource
|
||||
private EmployeeTrainingService employeeTrainingService;
|
||||
|
||||
@ApiOperation("培训员工列表")
|
||||
/*@ApiOperation("培训员工列表")
|
||||
@GetMapping("/trainingListByShopId")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
|
||||
})
|
||||
public ResponseResult<List<EmployeeTrainingVO>> trainingListByShopId(@RequestParam("shopId") Long shopId) {
|
||||
return ResponseResult.success(employeeTrainingService.trainingListByShopId(shopId));
|
||||
}
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user