3.4.0 update

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskQueryController.java

@@ -57,7 +57,7 @@ public class ExamTaskQueryController {
     @RequestMapping(value = "/paper_list", method = RequestMethod.POST)
     public Result taskPaperList(@ApiParam(value = "学期ID") @RequestParam(value = "semesterId", required = false) Long semesterId,
                                 @ApiParam(value = "考试ID") @RequestParam(value = "examId", required = false) Long examId,
-                                @ApiParam(value = "课程ID") @RequestParam(value = "courseCode", required = false) Long courseId,
+                                @ApiParam(value = "课程ID") @RequestParam(value = "courseId", required = false) Long courseId,
                                 @ApiParam(value = "试卷编号") @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                 @ApiParam(value = "入库时间（开始）") @RequestParam(value = "startTime", required = false) Long startTime,
                                 @ApiParam(value = "入库时间（结束）") @RequestParam(value = "endTime", required = false) Long endTime,

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

@@ -82,9 +82,9 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
                 if (CollectionUtils.isNotEmpty(markUserClassList)) {
                     classNames = markUserClassList.stream().map(MarkUserClass::getClassName).collect(Collectors.toList());
                 }
-                taskCount = markTaskService.countByExamIdAndPaperNumberAndGroupNumberAndUserIdAndAndClassNameStatusIn(examId, record.getPaperNumber(), record.getGroupNumber(), null, classNames);
+                taskCount = markTaskService.countByExamIdAndPaperNumberAndGroupNumberAndUserIdAndAndClassNameStatusIn(examId, record.getPaperNumber(), record.getGroupNumber(), sysUser.getId(), classNames);
                 record.setTaskCount(taskCount);
-                markedCount = markTaskService.countByExamIdAndPaperNumberAndGroupNumberAndUserIdAndAndClassNameStatusIn(examId, record.getPaperNumber(), record.getGroupNumber(), null, classNames, MarkTaskStatus.MARKED, MarkTaskStatus.ARBITRATED);
+                markedCount = markTaskService.countByExamIdAndPaperNumberAndGroupNumberAndUserIdAndAndClassNameStatusIn(examId, record.getPaperNumber(), record.getGroupNumber(), sysUser.getId(), classNames, MarkTaskStatus.MARKED, MarkTaskStatus.ARBITRATED);
                 record.setMarkedCount(markedCount);
             }
             record.setLeftCount(taskCount == 0 ? 0 : taskCount - markedCount);

teachcloud-mark/src/main/resources/mapper/MarkTaskMapper.xml

@@ -42,7 +42,7 @@
                  mt.exam_id,
                  mt.paper_number ,
                  count(1) totalCount,
-                 sum(case mt.status when 'MARKED' then 1 else 0 end) markedCount
+                 sum(case when mt.status in ('MARKED', 'ARBITRATED')  then 1 else 0 end) markedCount
              from mark_task mt
                 where mt.exam_id = #{examId}
                 <if test="courseId != null">