|
|
@@ -59,7 +59,7 @@ import java.util.stream.Collectors;
|
|
|
@Api(tags = "命题任务Controller")
|
|
|
@RestController
|
|
|
@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.exam}/task")
|
|
|
-//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
|
|
|
+
|
|
|
public class ExamTaskController {
|
|
|
|
|
|
@Autowired
|
|
|
@@ -273,7 +273,7 @@ public class ExamTaskController {
|
|
|
* @param paperNumber
|
|
|
* @param startTime
|
|
|
* @param endTime
|
|
|
- * @param userName 命题老师名称
|
|
|
+ * @param userName 命题老师名称
|
|
|
* @param pageNumber
|
|
|
* @param pageSize
|
|
|
* @return
|
|
|
@@ -449,7 +449,7 @@ public class ExamTaskController {
|
|
|
@RequestMapping(value = "/review_save_batch", method = RequestMethod.POST)
|
|
|
public Result taskReviewSaveBatch(@RequestBody ExamTaskReviewLog taskReviewLog) throws IOException {
|
|
|
List<Long> examTaskIdList = Arrays.asList(taskReviewLog.getExamTaskIds());
|
|
|
- if(!CollectionUtils.isEmpty(examTaskIdList)){
|
|
|
+ if (!CollectionUtils.isEmpty(examTaskIdList)) {
|
|
|
for (Long examTaskId : examTaskIdList) {
|
|
|
ExamTask examTask = examTaskService.getById(examTaskId);
|
|
|
Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
|
|
|
@@ -593,9 +593,11 @@ public class ExamTaskController {
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
|
|
|
public Result paperCardDownloadPdf(@RequestParam(value = "courseCode", required = false) String courseCode,
|
|
|
@RequestParam(value = "paperNumber", required = false) String paperNumber,
|
|
|
+ @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
|
|
|
+ @RequestParam(value = "makeMethod", required = false) MakeMethodEnum makeMethod,
|
|
|
@RequestParam(value = "startTime", required = false) Long startTime,
|
|
|
@RequestParam(value = "endTime", required = false) Long endTime) {
|
|
|
- TBTask tbTask = examTaskService.taskDownloadPdf(courseCode, paperNumber, startTime, endTime);
|
|
|
+ TBTask tbTask = examTaskService.taskDownloadPdf(courseCode, paperNumber, cardRuleId, makeMethod, startTime, endTime);
|
|
|
return Objects.nonNull(tbTask) ? ResultUtil.ok(new EditResult(tbTask.getId())) : ResultUtil.error("创建任务失败");
|
|
|
}
|
|
|
|
|
|
@@ -778,7 +780,7 @@ public class ExamTaskController {
|
|
|
@RequestParam Integer pageNumber,
|
|
|
@RequestParam Integer pageSize) {
|
|
|
Set<Long> classIds = Arrays.stream(classId.split(",")).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
|
|
|
- return ResultUtil.ok(basicStudentService.basicStudentPage(null,null,classIds,pageNumber,pageSize));
|
|
|
+ return ResultUtil.ok(basicStudentService.basicStudentPage(null, null, classIds, pageNumber, pageSize));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -812,6 +814,7 @@ public class ExamTaskController {
|
|
|
@ApiOperation(value = "命题任务-审批-获取试卷审批表pdf")
|
|
|
@RequestMapping(value = "/find_approve_form_pdf", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
|
|
|
+// @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
|
|
|
public void findApproveFormPdf(@ApiParam(value = "命题任务id", required = true) @RequestParam String examTaskId,
|
|
|
@ApiParam(value = "html", required = true) @RequestParam String htmlContent) throws Exception {
|
|
|
// -- 测试用html --
|
|
|
@@ -824,6 +827,5 @@ public class ExamTaskController {
|
|
|
examTaskService.findExamTaskApprovalPdf(response,SystemConstant.convertIdToLong(examTaskId), htmlContent);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
}
|
|
|
|
xiaof