|
@@ -553,22 +553,19 @@ public class ExamTaskController {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 暂存/提交
|
|
|
|
|
|
+ * 入库申请-新建命题任务
|
|
*
|
|
*
|
|
* @param examTaskApplyParam
|
|
* @param examTaskApplyParam
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@ApiOperation(value = "暂存/提交")
|
|
@ApiOperation(value = "暂存/提交")
|
|
- @RequestMapping(value = "/apply_save", method = RequestMethod.POST)
|
|
|
|
- public Result taskApplySave(@RequestBody ExamTaskApplyParam examTaskApplyParam) throws IOException {
|
|
|
|
-
|
|
|
|
|
|
+ @RequestMapping(value = "/save_task_apply", method = RequestMethod.POST)
|
|
|
|
+ public Result saveTaskApply(@RequestBody ExamTaskApplyParam examTaskApplyParam) throws IOException {
|
|
|
|
+ SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
|
|
ExamTask task = examTaskService.saveExamTaskNew(examTaskApplyParam.getExamTask());
|
|
ExamTask task = examTaskService.saveExamTaskNew(examTaskApplyParam.getExamTask());
|
|
- //发送短信
|
|
|
|
- if (task.getId() != null) {
|
|
|
|
- basicMessageService.sendNoticeTaskCreate(task);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ task.setUserId(sysUser.getId());
|
|
ExamTaskDetail examTaskDetail = examTaskApplyParam.getExamTaskDetail();
|
|
ExamTaskDetail examTaskDetail = examTaskApplyParam.getExamTaskDetail();
|
|
|
|
+ examTaskDetail.setExamTaskId(task.getId());
|
|
boolean isSuccess = examTaskService.saveExamTaskDetail(examTaskDetail);
|
|
boolean isSuccess = examTaskService.saveExamTaskDetail(examTaskDetail);
|
|
ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
|
|
ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
|
|
if (examTaskDetail.getOperateType().equals(ExamStatusEnum.SUBMIT.name()) && !examTask.getReview()) {
|
|
if (examTaskDetail.getOperateType().equals(ExamStatusEnum.SUBMIT.name()) && !examTask.getReview()) {
|
|
@@ -579,6 +576,19 @@ public class ExamTaskController {
|
|
return ResultUtil.ok(isSuccess);
|
|
return ResultUtil.ok(isSuccess);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 入库申请-新建命题任务-切换题卡
|
|
|
|
+ *
|
|
|
|
+ * @param examTaskId
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @ApiOperation(value = "切换题卡")
|
|
|
|
+ @RequestMapping(value = "/switch_card", method = RequestMethod.POST)
|
|
|
|
+ public Result switchCard(@RequestParam(value = "examTaskId") Long examTaskId) {
|
|
|
|
+ examTaskService.switchCard(examTaskId);
|
|
|
|
+ return ResultUtil.ok(true, "");
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查看印刷任务发布
|
|
* 查看印刷任务发布
|
|
*
|
|
*
|
|
@@ -626,8 +636,8 @@ public class ExamTaskController {
|
|
@ApiOperation(value = "卷库查询-发布印刷任务-班级列表")
|
|
@ApiOperation(value = "卷库查询-发布印刷任务-班级列表")
|
|
@RequestMapping(value = "/list_task_print_class", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/list_task_print_class", method = RequestMethod.POST)
|
|
public Result listTaskPrintClass(@RequestParam(value = "printPlanId") String printPlanId,
|
|
public Result listTaskPrintClass(@RequestParam(value = "printPlanId") String printPlanId,
|
|
- @RequestParam(value = "courseCode") String courseCode,
|
|
|
|
- @RequestParam(value = "paperNumber") String paperNumber) {
|
|
|
|
|
|
+ @RequestParam(value = "courseCode") String courseCode,
|
|
|
|
+ @RequestParam(value = "paperNumber") String paperNumber) {
|
|
List<TaskPrintClassDto> classDtos = examTaskPrintService.listClass(printPlanId, courseCode, paperNumber);
|
|
List<TaskPrintClassDto> classDtos = examTaskPrintService.listClass(printPlanId, courseCode, paperNumber);
|
|
return ResultUtil.ok(classDtos);
|
|
return ResultUtil.ok(classDtos);
|
|
}
|
|
}
|