3.3.0 update

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/ScanOmrTaskController.java

@@ -45,8 +45,7 @@ public class ScanOmrTaskController {
     @ApiOperation(value = "识别对照任务获取")
     @RequestMapping(value = "/get", method = RequestMethod.POST)
     public Result get(@RequestParam Long studentId) {
-        SysUser user = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(omrTaskService.getTask(studentId, user.getId()));
+        return ResultUtil.ok(omrTaskService.getTask(studentId));
     }
 
     @ApiOperation(value = "识别对照任务提交")
@@ -75,7 +74,11 @@ public class ScanOmrTaskController {
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@RequestParam Long examId,
                           @RequestParam OmrTaskStatus status) {
-        SysUser user = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(omrTaskService.list(examId, status, user.getId()));
+    	Long userId = null;
+    	if (status.equals(OmrTaskStatus.PROCESSED)) {
+			SysUser user = (SysUser) ServletUtil.getRequestUser();
+			userId = user.getId();
+		}
+        return ResultUtil.ok(omrTaskService.list(examId, status, userId));
     }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/ScanOmrTaskService.java

@@ -24,7 +24,7 @@ public interface ScanOmrTaskService extends IService<ScanOmrTask> {
 	
 	ScanOmrTask buildTask(ConditionType c, Long studentId);
 
-	ScanOmrStudent getTask(Long studentId, Long userId);
+	ScanOmrStudent getTask(Long studentId);
 
 	ScanOmrTaskSaveDto submitTask(List<ScanOmrTaskResultDto> result, Long userId);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanOmrTaskServiceImpl.java

@@ -340,7 +340,7 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
 	}
 
 	@Override
-	public ScanOmrStudent getTask(Long studentId, Long userId) {
+	public ScanOmrStudent getTask(Long studentId) {
 		MarkStudent student = studentService.getById(studentId);
 		if (student == null) {
 			throw ExceptionResultEnum.ERROR.exception("没有识别对照任务");
@@ -582,9 +582,6 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
 
 	@Override
 	public List<ScanStudentDto> list(Long examId, OmrTaskStatus status, Long userId) {
-		if (status.equals(OmrTaskStatus.WAITING)) {
-			userId = null;
-		}
 		return this.baseMapper.listByExamIdAndStatusAndUserId(examId, status, userId);
 	}