1
0
xiatian 1 жил өмнө
parent
commit
9053afbb96

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

@@ -280,4 +280,12 @@ public interface ExamStudentDao
 
     @Query("select distinct m.college from ExamStudent m where m.examId=?1 and m.subjectCode=?2 ")
     List<String> findDistinctCollegeBySubjectCode(int examId, String subjectCode);
+
+    @Modifying
+    @Query("update ExamStudent s set s.inspectCount=0,s.inspected=0, s.inspectTime=null ,s.inspectorId=null where s.id=?1 ")
+	public int clearInspect(Integer studentId);
+
+    @Modifying
+    @Query("update ExamStudent s set s.inspectCount=?2 where s.id=?1 ")
+	public void updateInspectCount(Integer studentId, Integer inspectCount);
 }

+ 4 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/ExamStudentService.java

@@ -208,4 +208,8 @@ public interface ExamStudentService {
     long countSheetCountByQuery(ExamStudentSearchQuery query);
 
 	Set<String> findSubjectHasTaskByExamId(int examId);
+
+	public void clearInspect(Integer studentId);
+
+	public void updateInspectCount(Integer studentId, Integer inspectCount);
 }

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

@@ -1360,7 +1360,17 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     public int cancelInspect(Integer studentId) {
         return studentDao.cancelInspect(studentId, false);
     }
-
+    @Transactional
+    @Override
+    public void clearInspect(Integer studentId) {
+        studentDao.clearInspect(studentId);
+    }
+    
+    @Transactional
+    @Override
+    public void updateInspectCount(Integer studentId, Integer inspectCount) {
+        studentDao.updateInspectCount(studentId, inspectCount);
+    }
     @Override
     public ExamStudentSearchQuery findByQueryPlus(ExamStudentSearchQuery query) {
         checkQuery(query);

+ 2 - 1
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/InspectedServiceImpl.java

@@ -317,6 +317,7 @@ public class InspectedServiceImpl extends BaseQueryService<ExamStudent> implemen
     public boolean cancelByStudent(Integer studentId) {
         if (studentService.cancelInspect(studentId) > 0) {
             inspectHistoryService.deleteByStudentIdAndInspectRound(studentId);
+            studentService.updateInspectCount(studentId, inspectHistoryService.countByStudentId(studentId));
         }
         return true;
     }
@@ -324,7 +325,7 @@ public class InspectedServiceImpl extends BaseQueryService<ExamStudent> implemen
     @Transactional
     @Override
     public void clearByStudent(Integer studentId) {
-        studentService.cancelInspect(studentId);
+        studentService.clearInspect(studentId);
         inspectHistoryService.deleteByStudentId(studentId);
     }
 

+ 4 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/inspectedList.jsp

@@ -350,6 +350,10 @@
     	if(secretNumber!=undefined && secretNumber!=""){
     		url = url+'&secretNumber='+secretNumber;
     	}
+    	var college =  $("#college").val();
+    	if(college!=undefined && college!=""){
+    		url = url+'&college='+college;
+    	}
     	window.open(url, '_blank');
         return false;
     }