fix

src/main/java/cn/com/qmth/scancentral/controller/admin/OmrGroupController.java

@@ -47,12 +47,18 @@ public class OmrGroupController extends BaseController {
     @Autowired
     private AsyncTaskExecutor taskExecutor;
 
-    @ApiOperation(value = "所有可用的识别对照条件")
+    @ApiOperation(value = "所有可新增的识别对照条件")
     @PostMapping("/conditions")
     public List<OmrConditionsVo> omrConditions() {
         return ConditionType.getOptionList().stream().map(OmrConditionsVo::new).collect(Collectors.toList());
     }
 
+    @ApiOperation(value = "所有识别对照条件")
+    @PostMapping("/conditions/all")
+    public List<OmrConditionsVo> omrConditionsAll() {
+        return Arrays.stream(ConditionType.values()).map(OmrConditionsVo::new).collect(Collectors.toList());
+    }
+
     @ApiOperation(value = "查询识别对照任务列表（分页）")
     @PostMapping(value = "/group/page")
     public PageResult<OmrGroupVo> page(OmrGroupQuery query) {

src/main/java/cn/com/qmth/scancentral/dao/AssignedCheckHistoryDao.java

@@ -1,8 +1,12 @@
 package cn.com.qmth.scancentral.dao;
 
 import cn.com.qmth.scancentral.entity.AssignedCheckHistoryEntity;
+import cn.com.qmth.scancentral.enums.Role;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 public interface AssignedCheckHistoryDao extends BaseMapper<AssignedCheckHistoryEntity> {
 
+    void deleteByStudentIdAndUserRole(@Param("studentId")Long studentId,@Param("userRole") Role role);
+
 }

src/main/java/cn/com/qmth/scancentral/service/AssignedCheckHistoryService.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.scancentral.service;
 
 import cn.com.qmth.scancentral.entity.AssignedCheckHistoryEntity;
+import cn.com.qmth.scancentral.enums.Role;
 
 public interface AssignedCheckHistoryService {
 
@@ -11,4 +12,6 @@ public interface AssignedCheckHistoryService {
     AssignedCheckHistoryEntity findByStudentIdAndUserId(Long studentId, Long userId);
 
     int getCountByUserId(Long userId, Long examId,String subjectCode);
+
+    void deleteByStudentIdAndUserRole(Long studentId, Role role);
 }

src/main/java/cn/com/qmth/scancentral/service/impl/AssignedCheckHistoryServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.scancentral.service.impl;
 
+import cn.com.qmth.scancentral.enums.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -69,4 +70,10 @@ public class AssignedCheckHistoryServiceImpl extends ServiceImpl<AssignedCheckHi
         lw.eq(AssignedCheckHistoryEntity::getSubjectCode, subjectCode);
         return this.count(wrapper);
     }
+
+    @Override
+    @Transactional
+    public void deleteByStudentIdAndUserRole(Long studentId, Role role) {
+        this.baseMapper.deleteByStudentIdAndUserRole(studentId,role);
+    }
 }

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

@@ -2565,7 +2565,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
                 student.setAbsentSuspect(false);
                 student.setAssignedCheckCount(1);
                 saveOrUpdate(student);
-                // assignedCheckHistoryService.deleteByStudentId(student.getId(),Role.AUDITOR);
+                assignedCheckHistoryService.deleteByStudentIdAndUserRole(student.getId(),Role.SCHOOL_ADMIN);
             } finally {
                 concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().unlock();
             }

src/main/resources/mapper/AssignedCheckHistoryMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.qmth.scancentral.dao.AssignedCheckHistoryDao">
+
+    <delete id="deleteByStudentIdAndUserRole">
+        DELETE FROM sc_assigned_check_history t1
+            JOIN sc_user t2 ON t1.user_id = t2.id
+        WHERE
+        t1.student_id = #{studentId}
+            AND t2.role = #{userRole}
+    </delete>
+
+</mapper>