ExamStudentDao,inspected字段更新需要从硬编码改为boolean参数

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

@@ -216,8 +216,8 @@ public interface ExamStudentDao extends PagingAndSortingRepository<ExamStudent,
     @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 (?2) and m.inspected=0 and m.upload=true and m.absent=false and m.breach=false ")
-    Set<String> findSubjectUnInspectedByExamId(int examId, SubjectiveStatus... status);
+    @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 s.college from ExamStudent s where s.examId=?1 group by s.college")
     public List<String> findDistinctCollege(int examId);
@@ -229,8 +229,8 @@ public interface ExamStudentDao extends PagingAndSortingRepository<ExamStudent,
     public Integer findMinInspectCountByExamIdAndSubjectCode(int examId, String subjectCode);
 
     @Modifying
-    @Query("update ExamStudent s set s.inspectCount=?2,s.inspected=1, s.inspectTime=?3 ,s.inspectorId=?4 where s.id=?1 ")
-    public void updateInspectCount(Integer studentId, Integer inspectCount,Date inspectTime, Integer inspectorId);
+    @Query("update ExamStudent s set s.inspectCount=?2,s.inspected=?5, s.inspectTime=?3 ,s.inspectorId=?4 where s.id=?1 ")
+    public void updateInspectCount(Integer studentId, Integer inspectCount,Date inspectTime, Integer inspectorId,boolean inspected);
 
     @Modifying
     @Query("update ExamStudent s set s.college=?2 ,s.className=?3, s.teacher=?4,s.examRoom=?5, s.examSite=?6, s.remark=?7 where s.id=?1 ")
@@ -242,16 +242,16 @@ public interface ExamStudentDao extends PagingAndSortingRepository<ExamStudent,
     public void scoreVerifyTag(Integer userId, Date time, Boolean tag, Integer studentId);
 
     @Modifying
-    @Query("update ExamStudent s set s.inspected=0,s.inspectTime=null ,s.inspectorId=null where s.examId=?1 and s.subjectCode=?2 and s.inspected=1")
-    public void cancelInspect(int examId, String subjectCode);
+    @Query("update ExamStudent s set s.inspected=?3,s.inspectTime=null ,s.inspectorId=null where s.examId=?1 and s.subjectCode=?2 and s.inspected=?4")
+    public void cancelInspect(int examId, String subjectCode,boolean inspected,boolean inspectedCon);
 
     @Modifying
-    @Query("update ExamStudent s set s.inspected=1, s.inspectTime=?2 ,s.inspectorId=?3 where s.id=?1 ")
-    public void inspect(Integer studentId, Date inspectTime, Integer inspectorId);
+    @Query("update ExamStudent s set s.inspected=?4, s.inspectTime=?2 ,s.inspectorId=?3 where s.id=?1 ")
+    public void inspect(Integer studentId, Date inspectTime, Integer inspectorId,boolean inspected);
 
     @Modifying
-    @Query("update ExamStudent s set s.inspected=0, s.inspectTime=null ,s.inspectorId=null where s.id=?1 ")
-    public void cancelInspect(Integer studentId);
+    @Query("update ExamStudent s set s.inspected=?2, s.inspectTime=null ,s.inspectorId=null where s.id=?1 ")
+    public void cancelInspect(Integer studentId,boolean inspected);
 
     @Modifying
     @Query("update ExamStudent s set s.trial=?2 where s.id=?1")

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

@@ -1207,7 +1207,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
 
     @Override
     public Set<String> findSubjectUnInspectedByExamId(int examId) {
-        return studentDao.findSubjectUnInspectedByExamId(examId, SubjectiveStatus.MARKED);
+        return studentDao.findSubjectUnInspectedByExamId(examId,false, SubjectiveStatus.MARKED);
     }
 
     @Override
@@ -1229,7 +1229,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     @Transactional
     @Override
     public void updateInspectCount(Integer studentId, Integer inspectCount,Date inspectTime, Integer inspectorId) {
-        studentDao.updateInspectCount(studentId, inspectCount,inspectTime,inspectorId);
+        studentDao.updateInspectCount(studentId, inspectCount,inspectTime,inspectorId,true);
     }
 
     /**
@@ -1327,13 +1327,13 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     @Transactional
     @Override
     public void inspect(Integer studentId, Date inspectTime, Integer inspectorId) {
-        studentDao.inspect(studentId, inspectTime, inspectorId);
+        studentDao.inspect(studentId, inspectTime, inspectorId,true);
     }
 
     @Transactional
     @Override
     public void cancelInspect(Integer studentId) {
-        studentDao.cancelInspect(studentId);
+        studentDao.cancelInspect(studentId,false);
     }
 
     @Override
@@ -1551,7 +1551,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     @Transactional
     @Override
     public void cancelInspect(int examId, String subjectCode) {
-        studentDao.cancelInspect(examId, subjectCode);
+        studentDao.cancelInspect(examId, subjectCode,false,true);
     }
 
     @Override

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

@@ -255,7 +255,7 @@ public class ExamSubjectServiceImpl extends BaseQueryService<ExamSubject> implem
     @Override
     public void nextInspectRound(int examId, String subjectCode) {
         subjectDao.nextInspectRound(examId, subjectCode);
-        examStudentDao.cancelInspect(examId, subjectCode);
+        examStudentDao.cancelInspect(examId, subjectCode,false,true);
     }
 
     @Transactional