|
@@ -202,19 +202,14 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
|
|
vo.getScan().setImageCheckCount(imageCheckCount);
|
|
vo.getScan().setImageCheckCount(imageCheckCount);
|
|
vo.getScan().setImageCheckTodoCount(imageCheckTodoCount);
|
|
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 adminTodoCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 1, OP.EQ);
|
|
int adminFinishCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 2, OP.GE);
|
|
int adminFinishCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 2, OP.GE);
|
|
int adminTotalCount = adminTodoCount + adminFinishCount;
|
|
int adminTotalCount = adminTodoCount + adminFinishCount;
|