提交 0f672a6f authored 作者: zjm's avatar zjm

fix(培训模块): 修改培训的线上报名代办人不对

修改培训的线上报名代办人不对
上级 07847c4c
...@@ -83,5 +83,13 @@ public class TestPaperController { ...@@ -83,5 +83,13 @@ public class TestPaperController {
return ResponseEntity.ok(trainTheme); return ResponseEntity.ok(trainTheme);
} }
/**
* 查询个人考卷
*/
@GetMapping("/testPaper/user/{trainId}")
@ApiOperation(value = "查询个人考卷,根据用户id,以及培训的id", notes = "查询个人考卷")
public ResponseEntity testPaperByIdAndtrainId(@PathVariable Integer trainId,@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
return ResponseEntity.ok(testPaperService.findByUserIdAndTrainId(securityUser.getCurrentUserInfo().getUserId(),trainId));
}
} }
...@@ -612,7 +612,7 @@ public class TrainJobController { ...@@ -612,7 +612,7 @@ public class TrainJobController {
if (trainTheme.getTrainType()==0) { if (trainTheme.getTrainType()==0) {
trainTaskService.selectBillidAndBillType(gradeEntryVo.getTrainThemeId(), BusinessEnum.TRAIN_STUDY.id, StatusEnum.TRAIN1013.id).forEach( trainTaskService.selectBillidAndBillType(gradeEntryVo.getTrainThemeId(), BusinessEnum.TRAIN_STUDY.id, StatusEnum.TRAIN1013.id).forEach(
taskBto1 -> { taskBto1 -> {
taskService.moveToSpecial(taskBto1, StatusEnum.TRAIN1009,taskBto1.getCreateUserId()); taskService.moveToSpecial(taskBto1, StatusEnum.TRAIN1009,taskBto1.getInvolveUserIdList().get(0));
} }
); );
}else { }else {
...@@ -719,6 +719,7 @@ public class TrainJobController { ...@@ -719,6 +719,7 @@ public class TrainJobController {
private TaskBto onlineLearningTaskCheck(Integer trainId, Integer parentTaskId,String title,Integer userId,Integer ownUnitId){ private TaskBto onlineLearningTaskCheck(Integer trainId, Integer parentTaskId,String title,Integer userId,Integer ownUnitId){
List<Integer> list=new ArrayList<>(); List<Integer> list=new ArrayList<>();
list.add(userId); list.add(userId);
return taskService.start(new TaskBto(StatusEnum.TRAIN1009.id,title , parentTaskId, ".", trainId, BusinessEnum.TRAIN_STUDY.id, ownUnitId, 0, "online", list)); TaskBto taskBto= new TaskBto(StatusEnum.TRAIN1009.id,title , parentTaskId, ".", trainId, BusinessEnum.TRAIN_STUDY.id, ownUnitId, 0, "online", list);
return taskService.start(taskBto);
} }
} }
...@@ -101,7 +101,7 @@ public class TrainTheme { ...@@ -101,7 +101,7 @@ public class TrainTheme {
* 培训地点 * 培训地点
*/ */
@ApiModelProperty(value = "培训地点") @ApiModelProperty(value = "培训地点")
private String trainLocation; private String trainLocation = "";
@Column(name = "train_data_files" ,columnDefinition = "TEXT") @Column(name = "train_data_files" ,columnDefinition = "TEXT")
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论