merge

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamStudentDao.java

@@ -117,6 +117,10 @@ public interface ExamStudentDao
     @Query("update ExamStudent s set s.manualAbsent=?3 where s.examId=?1 and s.examNumber=?2")
     public void updateManualAbsent(int examId, String examNumber, boolean manualAbsent);
 
+    @Modifying
+    @Query("update ExamStudent s set s.manualAbsent=?3 where s.examId=?1 and s.examNumber in ?2")
+    public void updateManualAbsent(int examId, List<String> examNumber, boolean manualAbsent);
+
     @Modifying
     @Query("update ExamStudent s set s.sheetCount=?2, s.sliceCount=?3, s.answers=?4, s.batchCode=?5, s.paperType=?6,"
             + " s.absent=?7, s.upload=true, s.uploadTime=?8, s.objectiveScore=?9, s.objectiveScoreList=?10, "
@@ -219,8 +223,8 @@ public interface ExamStudentDao
     @Query("select sum(s.sheetCount) from ExamStudent s where s.examId=?1 and s.subjectCode=?2 ")
     public Long sumSheetCountByExamIdAndSubjectCode(int examId, String subjectCode);
 
-    @Query("select distinct m.subjectCode from ExamStudent m where m.examId=?1 and m.subjectiveStatus in (?3) and m.inspected=?2 and m.upload=true and m.absent=false and m.breach=false ")
-    Set<String> findSubjectUnInspectedByExamId(int examId, boolean inspected, SubjectiveStatus... status);
+    @Query("select distinct m.subjectCode from ExamStudent m where m.examId=?1 and m.inspected=0 and m.upload=true and m.absent=false and m.breach=false ")
+    Set<String> findSubjectUnInspectedByExamId(int examId);
     
     @Query("select distinct m.subjectCode from ExamStudent m where m.examId=?1 and m.subjectiveStatus='MARKED' and m.upload=true and m.absent=false and m.breach=false ")
     Set<String> findSubjectHasTaskByExamId(int examId);

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -461,6 +461,12 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         studentDao.updateManualAbsent(examId, examNumber, manualAbsent);
     }
 
+    @Override
+    @Transactional
+    public void updateManualAbsent(int examId, List<String> examNumberIn, boolean manualAbsent) {
+        studentDao.updateManualAbsent(examId, examNumberIn, manualAbsent);
+    }
+
     @Override
     @Transactional
     public void clearManualAbsent(int examId) {
@@ -1249,7 +1255,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
 
     @Override
     public Set<String> findSubjectUnInspectedByExamId(int examId) {
-        return studentDao.findSubjectUnInspectedByExamId(examId, false, SubjectiveStatus.MARKED);
+        return studentDao.findSubjectUnInspectedByExamId(examId);
     }
 
     @Override