yin 8 ay önce
ebeveyn
işleme
3216c57a5a

+ 8 - 13
src/main/java/cn/com/qmth/scancentral/service/impl/ExamServiceImpl.java

@@ -202,19 +202,14 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         vo.getScan().setImageCheckCount(imageCheckCount);
         vo.getScan().setImageCheckTodoCount(imageCheckTodoCount);
 
-        if (!exam.getEnableSyncVerify()) {
-            int auditorTodoCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 0, OP.EQ);
-            int auditorFinishCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 0, OP.GT);
-            int auditorTotalCount = auditorTodoCount + auditorFinishCount;
-            double auditorFinishRate = MathUtil.percentage(auditorFinishCount, auditorTotalCount);
-            vo.getAssignedCheck().setAuditorTodoCount(auditorTodoCount);
-            vo.getAssignedCheck().setAuditorFinishCount(auditorFinishCount);
-            vo.getAssignedCheck().setAuditorFinishRate(auditorFinishRate);
-        } else {
-            vo.getAssignedCheck().setAuditorTodoCount(0);
-            vo.getAssignedCheck().setAuditorFinishCount(0);
-            vo.getAssignedCheck().setAuditorFinishRate(0);
-        }
+        int auditorTodoCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 0, OP.EQ);
+        int auditorFinishCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 0, OP.GT);
+        int auditorTotalCount = auditorTodoCount + auditorFinishCount;
+        double auditorFinishRate = MathUtil.percentage(auditorFinishCount, auditorTotalCount);
+        vo.getAssignedCheck().setAuditorTodoCount(auditorTodoCount);
+        vo.getAssignedCheck().setAuditorFinishCount(auditorFinishCount);
+        vo.getAssignedCheck().setAuditorFinishRate(auditorFinishRate);
+
         int adminTodoCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 1, OP.EQ);
         int adminFinishCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 2, OP.GE);
         int adminTotalCount = adminTodoCount + adminFinishCount;

+ 5 - 2
src/main/java/cn/com/qmth/scancentral/service/impl/StudentServiceImpl.java

@@ -1956,11 +1956,10 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     @Override
     public TaskStatusVo getAssignedCheckTaskStatus(Long examId, String subjectCode, User user) {
         TaskStatusVo status = new TaskStatusVo();
+        status.setFinishCount(assignedCheckHistoryService.getCountByUserId(user.getId(), examId, subjectCode));
         if (Role.AUDITOR.equals(user.getRole())) {
-            status.setFinishCount(assignedCheckHistoryService.getCountByUserId(user.getId(), examId, subjectCode));
             status.setTodoCount(this.getCountByExamAndAssignedCheckCount(examId, subjectCode, 0, OP.EQ));
         } else {
-            status.setFinishCount(this.getCountByExamAndAssignedCheckCount(examId, subjectCode, 2, OP.GE));
             status.setTodoCount(this.getCountByExamAndAssignedCheckCount(examId, subjectCode, 1, OP.EQ));
         }
         return status;
@@ -2016,6 +2015,10 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
 
     @Override
     public AnswerQueryVo getAssignedCheckTask(Long examId, String subjectCode, User user) {
+        ExamEntity exam = examService.getById(examId);
+        if(exam.getEnableSyncVerify() && Role.AUDITOR.equals(user.getRole())){
+            throw new ParameterException("已开启实时审核,审核员无法获取任务");
+        }
         int retry = 1;
         AnswerQueryVo task = null;
         int checkCount = 0;