Merge branch 'dev_v3.3.3' into dev_v3.3.4

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

@@ -613,7 +613,7 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
     @Override
     public int getFinishStudentCountByExamAndUserId(Long examId, String courseCode, String coursePaperId, String status,
             DataPermissionRule dpr) {
-        return this.baseMapper.getStudentCountByExamAndStatusAndUserId(examId,ScanStatus.SCANNED.getName(), courseCode, coursePaperId, status,
+        return this.baseMapper.getStudentCountByExamAndStatusAndUserId(examId,ScanStatus.SCANNED.name(), courseCode, coursePaperId, status,
                 MarkPaperStatus.FORMAL.name(), dpr);
     }
 
@@ -654,7 +654,7 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(),
                 sysUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.listByExamIdAndStatusAndUserId(examId,ScanStatus.SCANNED.getName(), courseCode, coursePaperId, status,
+        return this.baseMapper.listByExamIdAndStatusAndUserId(examId,ScanStatus.SCANNED.name(), courseCode, coursePaperId, status,
                 MarkPaperStatus.FORMAL.name(), dpr);
     }