ting.yin hace 1 año
padre
commit
6977615aad

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

@@ -431,6 +431,10 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     @Override
     @Transactional
     public boolean updateBreach(int id, boolean breach) {
+        if (breach == true) {
+            studentDao.updateObjectiveScore(id, 0, null);
+            studentDao.updateSubjectiveStatusAndScore(id, SubjectiveStatus.UNMARK, 0, null);
+        }
         return studentDao.updateBreach(id, breach) > 0;
     }
 

+ 1 - 1
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkCronService.java

@@ -122,7 +122,7 @@ public class MarkCronService {
         log.info("start auto-create library");
         try {
             List<Integer> examIds = groupService.findExamIdByStatus(ExamStatus.START, MarkStatus.TRIAL,
-                    MarkStatus.FORMAL);
+                    MarkStatus.FORMAL, MarkStatus.FINISH);
             for (Integer examId : examIds) {
                 buildLibraryByExam(examId);
             }

+ 2 - 11
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/StudentController.java

@@ -1,6 +1,5 @@
 package cn.com.qmth.stmms.admin.exam;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -441,13 +440,7 @@ public class StudentController extends BaseExamController {
                 }
                 ExamStudent student = studentService.findByExamIdAndExamNumber(examId, studentVO.getExamNumber());
                 if (student != null) {
-                    student.setBreach(true);
-                    student.setObjectiveScore(0d);
-                    student.setObjectiveScoreList(null);
-                    student.setSubjectiveScore(0d);
-                    student.setSubjectiveScoreList(null);
-                    studentService.save(student);
-                    studentService.updateSubjectiveStatusAndScore(student.getId(), SubjectiveStatus.UNMARK, 0, null);
+                    studentService.updateBreach(student.getId(), true);
                     successNum++;
                 } else {
                     failureMsg.append("<br/>准考证号 " + studentVO.getExamNumber() + " 不存在; ");
@@ -474,10 +467,8 @@ public class StudentController extends BaseExamController {
     public JSONObject updateBreach(HttpServletRequest request, Integer id) {
         JSONObject result = new JSONObject();
         ExamStudent student = studentService.findById(id);
-        student.setBreach(false);
-        student.setUploadTime(new Date());
-        student = studentService.save(student);
         if (student != null) {
+            studentService.updateBreach(id, false);
             result.accumulate("message", "重置成功!");
             result.accumulate("success", true);
         } else {

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

@@ -199,9 +199,11 @@
 	</form>
 <script type="text/javascript">
 function goAdd() {
+	$('.editWindow').hide();
 	$('.addWindow').show();
 }
 function goEdit() {
+	 $('.addWindow').hide();
 	$('.editWindow').show();
 }
 function goScorePolicy(selectiveIndex,a,b,c) {