fix

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

@@ -29,17 +29,20 @@ import cn.com.qmth.stmms.biz.exam.model.Exam;
 import cn.com.qmth.stmms.biz.exam.model.ExamPackage;
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
+import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.query.ExamStudentSearchQuery;
 import cn.com.qmth.stmms.biz.exam.service.ExamPackageService;
 import cn.com.qmth.stmms.biz.exam.service.ExamService;
 import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
+import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
 import cn.com.qmth.stmms.biz.file.service.FileService;
 import cn.com.qmth.stmms.biz.mark.service.MarkService;
 import cn.com.qmth.stmms.common.annotation.Logging;
 import cn.com.qmth.stmms.common.annotation.RoleRequire;
 import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.LogType;
+import cn.com.qmth.stmms.common.enums.MarkStatus;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
@@ -72,6 +75,9 @@ public class StudentController extends BaseExamController {
     @Autowired
     private FileService fileService;
 
+    @Autowired
+    private MarkGroupService groupService;
+
     private static final String NULL_PAPER_TYPE_PLACEHOLDER = "#";
 
     private static final String PAPER_TYPES_REGEX = "[a-zA-Z#]";
@@ -467,8 +473,13 @@ public class StudentController extends BaseExamController {
     public JSONObject updateBreach(HttpServletRequest request, Integer id) {
         JSONObject result = new JSONObject();
         ExamStudent student = studentService.findById(id);
-        if (student != null) {
-            studentService.updateBreach(id, false);
+        if (student != null && studentService.updateBreach(id, false)) {
+            List<MarkGroup> groupList = groupService.findByExamAndSubjectAndStatus(student.getExamId(),
+                    student.getSubjectCode(), MarkStatus.FINISH);
+            for (MarkGroup markGroup : groupList) {
+                groupService.updateStatus(student.getExamId(), student.getSubjectCode(), markGroup.getNumber(),
+                        MarkStatus.FORMAL, MarkStatus.FINISH);
+            }
             result.accumulate("message", "重置成功！");
             result.accumulate("success", true);
         } else {

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examExport.jsp

@@ -62,9 +62,9 @@
             </p>
             <p class="title bold">1、扫描阅卷</p>
             <p class="text-indent">
-              已完成采集电子图像共<span class="border-b"><input class="w60" value="${subjectCount }"</></span>科目，
-              <span class="border-b"><input class="w60" value="${studentCount }"</></span>科次
-              <span class="border-b"><input class="w60" value="${sheetCount}"</></span>张答题卡，扫描阅卷过程规范，按时完成整个项目、结果无错误。
+              已完成采集电子图像共<span class="border-b"><input class="w60" value="${subjectCount }"/></span>科目，
+              <span class="border-b"><input class="w60" value="${studentCount }"/></span>科次
+              <span class="border-b"><input class="w60" value="${sheetCount}"/></span>张答题卡，扫描阅卷过程规范，按时完成整个项目、结果无错误。
             </p>
             <table class="my-table" border="1">
               <thead>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/groupEditFull.jsp

@@ -5,6 +5,7 @@
     <title>评卷分组修改</title>
     <meta name="decorator" content="default"/>
     <%@include file="/WEB-INF/views/include/head.jsp" %>
+   <link rel="stylesheet" href="${ctxStatic}/common/animate.min.css" />
 	<style>
 		#delete-modal{
             position:fixed;
@@ -490,6 +491,10 @@ function createDialog() {
                 $('.subjectCode input,.groupNumber input').val('')
                 $('.groupNumber input+.error-tip').html('');
                 this.warningIndex++;
+                $('#deleteDiv').removeClass('animate__animated animate__fadeIn')
+                setTimeout(function(){
+                    $('#deleteDiv').addClass('animate__animated animate__fadeIn')
+                },0)
                 this.setDialogTitle(this.warningIndex);
             }
         },