3.4.4 update-20250305，联调bug修复2

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

@@ -21,5 +21,5 @@ public interface MarkQuestionMapper extends BaseMapper<MarkQuestion> {
 
     List<MarkQuestionAnswerVo> listQuestionAnswerByExamIdAndPaperNumberAndPaperType(@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("paperType") String paperType, @Param("objective") Boolean objective);
 
-    long countByExamIdAndPaperNumberAndObjective(@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("objective") boolean objective);
+    long countUnBindMarkerByExamIdAndPaperNumberAndObjective(@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("objective") boolean objective);
 }

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

@@ -124,5 +124,6 @@ public interface MarkQuestionService extends IService<MarkQuestion> {
 
     void updatePic(String content, List<MarkQuestion> markQuestions);
 
+    long countUnBindMarkerByExamIdAndPaperNumberAndObjective(Long examId, String paperNumber, boolean objective);
     long countByExamIdAndPaperNumberAndObjective(Long examId, String paperNumber, boolean objective);
 }

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

@@ -819,8 +819,17 @@ public class MarkQuestionServiceImpl extends ServiceImpl<MarkQuestionMapper, Mar
         this.updateBatchById(markQuestions);
     }
 
+    @Override
+    public long countUnBindMarkerByExamIdAndPaperNumberAndObjective(Long examId, String paperNumber, boolean objective) {
+        return this.baseMapper.countUnBindMarkerByExamIdAndPaperNumberAndObjective(examId, paperNumber, objective);
+    }
+
     @Override
     public long countByExamIdAndPaperNumberAndObjective(Long examId, String paperNumber, boolean objective) {
-        return this.baseMapper.countByExamIdAndPaperNumberAndObjective(examId, paperNumber, objective);
+        QueryWrapper<MarkQuestion> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(MarkQuestion::getExamId, examId)
+                .eq(MarkQuestion::getPaperNumber, paperNumber)
+                .eq(MarkQuestion::getObjective, objective);
+        return this.count(queryWrapper);
     }
 }

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

@@ -366,7 +366,7 @@ public class MarkServiceImpl implements MarkService {
 
     @Override
     public void checkStudentSubjective(Long studentId, Long examId, String paperNumber) {
-        long unBindMarkerQuestionCount = markQuestionService.countByExamIdAndPaperNumberAndObjective(examId, paperNumber, false);
+        long unBindMarkerQuestionCount = markQuestionService.countUnBindMarkerByExamIdAndPaperNumberAndObjective(examId, paperNumber, false);
         long questionCount = markQuestionService.countByExamIdAndPaperNumberAndObjective(examId, paperNumber, false);
         long subjectiveScoreCount = markSubjectiveScoreService.countByStudentId(studentId);
         // 主观题数大于0，主观题全部绑定了评卷员，考生小题分数数量等于主观题数量

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

@@ -59,7 +59,7 @@
                 AND mq.sub_number = mqa.sub_number
         order by mq.main_number, mq.sub_number
     </select>
-    <select id="countByExamIdAndPaperNumberAndObjective" resultType="java.lang.Long">
+    <select id="countUnBindMarkerByExamIdAndPaperNumberAndObjective" resultType="java.lang.Long">
         SELECT
             count(1)
         FROM

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

@@ -398,6 +398,7 @@
                         AND mt.paper_Number = muq.paper_number
                         AND mt.question_id = muq.question_id
                         AND muq.user_id = #{userId}
+                        AND muq.enable = true
                         <if test="questionId != null">
                             and muq.question_id = #{questionId}
                         </if>