提交 600b5538 authored 作者: zjm's avatar zjm

fix(培训模块): 修改培训报名报500的错误(专管员是新添加的 再去报名,就会报错)

修改培训报名报500的错误(专管员是新添加的 再去报名,就会报错)
上级 be9081ed
......@@ -681,13 +681,13 @@ public class TrainJobController {
@ApiOperation(value = "报名页面和确认页面接口,查看成绩页面接口")
@GetMapping("/train/{trainId}")
public ResponseEntity resultsConfirm(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @PathVariable Integer trainId) {
return ResponseEntity.ok(trainThemeService.findByTrainingPeople(trainId, securityUser.getCurrentUserInfo().getUserId()));
return ResponseEntity.ok(trainThemeService.findByTrainingPeople(trainId, securityUser.getCurrentUserInfo().getUnitsId()));
}
@ApiOperation(value = "成绩确认页面接口,查看成绩页面接口")
@GetMapping("/train/check/{trainId}")
public ResponseEntity resultsConfirmCheck(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @PathVariable Integer trainId) {
return ResponseEntity.ok(trainThemeService.findByTrainingPeople(trainId, securityUser.getCurrentUserInfo().getUserId()));
return ResponseEntity.ok(trainThemeService.findByTrainingPeople(trainId, securityUser.getCurrentUserInfo().getUnitsId()));
}
@ApiOperation(value = "报名中请求的详情接口")
......
......@@ -26,7 +26,7 @@ public interface TrainThemeService {
List<TrainTheme> findAllStatus(Integer status);
ByTrainingPeople findByTrainingPeople(Integer trainThemeId, Integer userId);
ByTrainingPeople findByTrainingPeople(Integer trainThemeId, Integer unitId);
ByTrainingPeopleCheck findByTrainingPeopleCheck(Integer trainThemeId, Integer userId);
......
......@@ -134,12 +134,11 @@ public class TrainThemeServiceImpl implements TrainThemeService {
}
@Override
public ByTrainingPeople findByTrainingPeople(Integer trainThemeId, Integer userId) {
public ByTrainingPeople findByTrainingPeople(Integer trainThemeId, Integer unitId) {
TrainTheme trainTheme = trainThemeDao.findById(trainThemeId).get();
ByTrainingPeople byTrainingPeople = trainTheme.toByTrainingPeople();
TrainUser trainUser=trainUserDao.findByUserIdAndTrainId(userId,trainThemeId);
List<TrainUser> trainUsers=trainUserDao.findAllByUnitsIdAndTrainId(trainUser.getUnitsId(),trainThemeId);
Units units= unitsCache.findById(trainUser.getUnitsId());
List<TrainUser> trainUsers=trainUserDao.findAllByUnitsIdAndTrainId(unitId,trainThemeId);
Units units= unitsCache.findById(unitId);
Map<Integer,User> map = userService.findAllByUnite(units.getUnitId()).stream().collect(Collectors.toMap(User::getUserId,Function.identity()));
Set<Integer> ids=map.keySet();
ids.removeAll(trainUsers.stream().map(TrainUser::getUserId).collect(Collectors.toList()));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论