xiatian 8 mēneši atpakaļ
vecāks
revīzija
b372bb0cee

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/StudentService.java

@@ -217,7 +217,7 @@ public interface StudentService extends IService<StudentEntity> {
 
     int countCetMarking(ExportCetMarkingQueryVo query);
 
-    void updateImageCheckStatus(Long id, ImageCheckStatus failed);
+    void updateImageCheckStatus(Long studentId, ImageCheckStatus failed);
 
     void breachImportDispose(BreachAndStatusImportTaskVo vo);
 

+ 16 - 12
src/main/java/cn/com/qmth/scancentral/service/impl/PaperServiceImpl.java

@@ -35,6 +35,7 @@ import cn.com.qmth.scancentral.bean.papermigrate.PaperMigrateDomain;
 import cn.com.qmth.scancentral.bean.papermigrate.PaperMigratePage;
 import cn.com.qmth.scancentral.dao.PaperDao;
 import cn.com.qmth.scancentral.entity.*;
+import cn.com.qmth.scancentral.enums.ImageCheckStatus;
 import cn.com.qmth.scancentral.enums.LockType;
 import cn.com.qmth.scancentral.enums.UploadStatus;
 import cn.com.qmth.scancentral.service.*;
@@ -248,6 +249,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
             paperPageService.updateByMultiId(page);
             // 更新考生文件上传状态
             studentService.updateFileUploadStatus(sp.getStudentId(), UploadStatus.WAITING_UPLOAD);
+            studentService.updateImageCheckStatus(sp.getStudentId(), ImageCheckStatus.WAITING);
             return UriVo.create(path);
         } catch (Exception e) {
             log.error("裁切图更新失败,paperId=" + paperId + ", pageIndex=" + pageIndex + ", index=" + index, e);
@@ -439,18 +441,20 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
         return this.baseMapper.findByStudentIds(studentIds);
     }
 
-//    @Override
-//    @Transactional
-//    public void updatePaperAssignedSuspect(Long id, Integer number, Boolean assignedSuspect) {
-//        StudentPaperEntity sp = studentPaperService.findByStudentIdAndPaperNumber(id, number);
-//        if (sp == null) {
-//            throw new ParameterException("未找到绑定扫描结果");
-//        }
-//        LambdaUpdateWrapper<PaperEntity> lw = new LambdaUpdateWrapper<>();
-//        lw.set(PaperEntity::getAssignedSuspect, assignedSuspect);
-//        lw.eq(PaperEntity::getId, sp.getPaperId());
-//        this.update(lw);
-//    }
+    // @Override
+    // @Transactional
+    // public void updatePaperAssignedSuspect(Long id, Integer number, Boolean
+    // assignedSuspect) {
+    // StudentPaperEntity sp =
+    // studentPaperService.findByStudentIdAndPaperNumber(id, number);
+    // if (sp == null) {
+    // throw new ParameterException("未找到绑定扫描结果");
+    // }
+    // LambdaUpdateWrapper<PaperEntity> lw = new LambdaUpdateWrapper<>();
+    // lw.set(PaperEntity::getAssignedSuspect, assignedSuspect);
+    // lw.eq(PaperEntity::getId, sp.getPaperId());
+    // this.update(lw);
+    // }
 
     @Override
     public List<StudentPaperVo> listByBatchIdAndStudentId(Long batchId, Long studentId) {

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

@@ -1983,7 +1983,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         }
         concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().lock();
         try {
-            assignedCheckHistoryService.deleteByStudentIdAndUserRole(student.getId(),user.getRole());
+            assignedCheckHistoryService.deleteByStudentIdAndUserRole(student.getId(), user.getRole());
             assignedCheckHistoryService.save(user.getId(), student.getId(), student.getExamId());
             // for (AssignedTaskResultPaper paper : result.getPapers()) {
             // paperService.updatePaperAssignedSuspect(student.getId(),
@@ -2016,7 +2016,7 @@ 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())){
+        if (exam.getEnableSyncVerify() && Role.AUDITOR.equals(user.getRole())) {
             throw new ParameterException("已开启实时审核,审核员无法获取任务");
         }
         int retry = 1;
@@ -2569,10 +2569,10 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
 
     @Transactional
     @Override
-    public void updateImageCheckStatus(Long id, ImageCheckStatus status) {
+    public void updateImageCheckStatus(Long studentId, ImageCheckStatus status) {
         LambdaUpdateWrapper<StudentEntity> lw = new LambdaUpdateWrapper<>();
         lw.set(StudentEntity::getImageCheckStatus, status);
-        lw.eq(StudentEntity::getId, id);
+        lw.eq(StudentEntity::getId, studentId);
         update(lw);
     }
 

+ 0 - 1
src/main/java/cn/com/qmth/scancentral/service/impl/ToolExportServiceImpl.java

@@ -204,7 +204,6 @@ public class ToolExportServiceImpl implements ToolExportService {
                 throw new StatusException("文件大小有误");
             }
         }
-        studentService.updateImageCheckStatus(student.getId(), ImageCheckStatus.SUCCESS);
     }
 
     @Override