3.3.0 fix

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkStudentMapper.java

@@ -47,8 +47,7 @@ public interface MarkStudentMapper extends BaseMapper<MarkStudent> {
 
 	List<String> querySummary(@Param("query") AnswerQueryDomain query, @Param("dpr") DataPermissionRule dpr);
 
-	List<Long> findIdByExamIdAndPaperNumberAndSubjectiveStatus(@Param("examId") Long examId,
-			@Param("paperNumber") String paperNumber, @Param("unmark") String unmark, @Param("marked") String marked);
+	List<Long> findIdByExamIdAndPaperNumber(@Param("examId") Long examId, @Param("paperNumber") String paperNumber);
 
 	List<ArchiveStudentVo> studentList(@Param("req") ArchiveStudentQuery query);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkStudentService.java

@@ -105,8 +105,7 @@ public interface MarkStudentService extends IService<MarkStudent> {
 
     UpdateTimeVo confirm(Long examId, String coursePaperId, String studentCode, Boolean omrAbsent);
 
-    List<Long> findIdByExamIdAndPaperNumberAndSubjectiveStatus(Long examId, String paperNumber, SubjectiveStatus unmark,
-            SubjectiveStatus marked);
+    List<Long> findIdByExamIdAndPaperNumber(Long examId, String paperNumber);
 
     Task getSubjectiveInspectedTask(Long studentId);
 

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

@@ -899,9 +899,7 @@ public class MarkServiceImpl implements MarkService {
             markStudentService.updateSubjectiveStatusAndScore(markGroup.getExamId(), markGroup.getPaperNumber(),
                     SubjectiveStatus.UNMARK, null, null);
         } else {
-            List<Long> studentList = markStudentService.findIdByExamIdAndPaperNumberAndSubjectiveStatus(
-                    markGroup.getExamId(), markGroup.getPaperNumber(), SubjectiveStatus.UNMARK,
-                    SubjectiveStatus.MARKED);
+            List<Long> studentList = markStudentService.findIdByExamIdAndPaperNumber(markGroup.getExamId(), markGroup.getPaperNumber());
             for (Long studentId : studentList) {
                 checkStudentSubjective(studentId, groupCount, unGroupQuestionCount);
             }

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

@@ -803,10 +803,8 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
     }
 
     @Override
-    public List<Long> findIdByExamIdAndPaperNumberAndSubjectiveStatus(Long examId, String paperNumber,
-                                                                      SubjectiveStatus unmark, SubjectiveStatus marked) {
-        return this.baseMapper.findIdByExamIdAndPaperNumberAndSubjectiveStatus(examId, paperNumber, unmark.name(),
-                marked.name());
+    public List<Long> findIdByExamIdAndPaperNumber(Long examId, String paperNumber) {
+        return this.baseMapper.findIdByExamIdAndPaperNumber(examId, paperNumber);
     }
 
     @Override

teachcloud-mark/src/main/resources/mapper/MarkStudentMapper.xml

@@ -281,8 +281,8 @@
         <include refid="queryWhereAndOrder"/>
         order by t.id
     </select>
-    <select id="findIdByExamIdAndPaperNumberAndSubjectiveStatus" resultType="java.lang.Long">
-        select id from mark_student where exam_id = #{examId} and paper_number = #{paperNumber} and subjective_status in (#{unmark}, #{marked})
+    <select id="findIdByExamIdAndPaperNumber" resultType="java.lang.Long">
+        select id from mark_student where exam_id = #{examId} and paper_number = #{paperNumber}
     </select>
     <select id="studentList"
             resultType="com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentVo">