Эх сурвалжийг харах

成绩导出标准版本加入缺考考生

wangliang 2 жил өмнө
parent
commit
f710930f32

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/dao/TOeExamRecordMapper.java

@@ -414,9 +414,10 @@ public interface TOeExamRecordMapper extends BaseMapper<TOeExamRecord> {
      *
      * @param examId
      * @param examStudentId
+     * @param examStudentBreachPush
      * @return
      */
-    public List<TOeExamRecord> findMaxObjectiveScore(@Param("examId") Long examId, @Param("examStudentId") Long examStudentId);
+    public List<TOeExamRecord> findMaxObjectiveScore(@Param("examId") Long examId, @Param("examStudentId") Long examStudentId, @Param("examStudentBreachPush") Boolean examStudentBreachPush);
 
     /**
      * 根据orgId查找 在线人数/已待考/考试人数

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TOeExamRecordServiceImpl.java

@@ -1003,7 +1003,8 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
      */
     @Override
     public List<TOeExamRecord> findMaxObjectiveScore(Long examId, Long examStudentId) {
-        return tOeExamRecordMapper.findMaxObjectiveScore(examId, examStudentId);
+        ExamCacheBean examCacheBean = examService.getExamCacheBean(examId);
+        return tOeExamRecordMapper.findMaxObjectiveScore(examId, examStudentId, examCacheBean.getExamStudentBreachPush());
     }
 
     /**

+ 3 - 2
themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -1240,8 +1240,9 @@
         from
         t_oe_exam_record toer
         <where>
-            (toer.breach_status = 1
-            or breach_status is null)
+            <if test="examStudentBreachPush != null and (examStudentBreachPush == false or examStudentBreachPush == 0)">
+                and (toer.breach_status = 1 or breach_status is null)
+            </if>
             and (toer.status = 'FINISHED'
             or toer.status = 'PERSISTED')
             <if test="examId != null and examId != ''">