fixs

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

@@ -242,7 +242,7 @@ 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")
+    @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=0")
     public void cancelInspect(int examId, String subjectCode);
 
     @Modifying

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkServiceImpl.java

@@ -317,10 +317,12 @@ public class MarkServiceImpl implements MarkService {
                 group.getExamId(), group.getSubjectCode(), false);
         // 考生整体状态与总分更新
         long groupCount = groupDao.countByExamIdAndSubjectCode(group.getExamId(), group.getSubjectCode());
+        if (groupCount == 0) {
+            studentService.resetTrial(group.getExamId(), group.getSubjectCode(), false);
+        }
         if (groupCount == 0 || unGroupQuestionCount > 0) {
             studentService.updateSubjectiveStatusAndScoreAndInspectorId(group.getExamId(), group.getSubjectCode(),
                     SubjectiveStatus.UNMARK, 0, null, null, null);
-            studentService.resetTrial(group.getExamId(), group.getSubjectCode(), false);
             inspectHistoryService.deleteByExamIdAndSubjectCode(group.getExamId(), group.getSubjectCode());
         } else {
             List<Integer> studentList = studentService.findIdByExamIdAndSubjectCodeAndSubjectiveStatus(

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

@@ -326,22 +326,22 @@
             <img src="${ctxStatic}/images/dialog_close_icon.png" class="close-icon" onclick="deleteDivHide()"/>
         </div>
         <div class="sub-title sub-title1">
-            删除分组将会<span>清掉已完成</span>的评卷任务及评卷员信息，确认删除吗？
+            该操作分组将会<span>清掉已完成</span>的评卷任务及评卷员信息，确认吗？
         </div>
         <div class="sub-title sub-title2">
-            确认删除，请联系大区经理获取授权码
+            确认删除或重置，请联系大区经理获取授权码
         </div>
         <div class="my-form-body">
             <div class="gray-bg">
                 <div class="my-form-item subjectCode">
-                    <label>输入删除科目代码</label>
+                    <label>输入科目代码</label>
                     <div class="control-box">
                         <input type="text" id="subjectCode">
                         <div class="error-tip"></div>
                     </div>
                 </div>
                 <div class="my-form-item groupNumber">
-                    <label>输入删除分组序号</label>
+                    <label>输入分组序号</label>
                     <div class="control-box">
                         <input type="text" id="groupNumber">
                         <div class="error-tip"></div>
@@ -437,7 +437,7 @@ function createDialog() {
                 $('.sub-title2,.authCode').hide();
 
             } else {
-                $('#deleteDiv .title').html('删除分组授权码');
+                $('#deleteDiv .title').html('分组授权码');
                 $('.sub-title1,.subjectCode,.groupNumber').hide();
                 $('.sub-title2,.authCode').show();
             }
@@ -446,8 +446,8 @@ function createDialog() {
             if (this.warningIndex <= 3) {
                 var subjectCodeVal = $('.subjectCode input').val();
                 var groupNumberVal = $('.groupNumber input').val();
-                $('.subjectCode input+.error-tip').html(!subjectCodeVal?'请输入要删除的科目代码':subjectCodeVal != this.initParams.subjectCode?'输入的科目代码不正确':'')
-                $('.groupNumber input+.error-tip').html(!groupNumberVal?'请输入要删除的分组序号':groupNumberVal != this.initParams.groupNumber?'输入的分组序号不正确':'')
+                $('.subjectCode input+.error-tip').html(!subjectCodeVal?'请输入科目代码':subjectCodeVal != this.initParams.subjectCode?'输入的科目代码不正确':'')
+                $('.groupNumber input+.error-tip').html(!groupNumberVal?'请输入分组序号':groupNumberVal != this.initParams.groupNumber?'输入的分组序号不正确':'')
 
                 if (!subjectCodeVal || !groupNumberVal || subjectCodeVal != this.initParams.subjectCode || groupNumberVal != this.initParams.groupNumber) {
                     return;