fix bugs

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

@@ -256,10 +256,14 @@ public interface ExamStudentDao extends PagingAndSortingRepository<ExamStudent,
 
     @Modifying
     @Query("update ExamStudent s set s.trial=?2 where s.id=?1")
-    public int updateTrial(Integer studentId, boolean trial);
+    public int updateTrialById(Integer studentId, boolean trial);
 
     @Modifying
     @Query("update ExamStudent s set s.scoreVerifyUser=?1,s.scoreVerifyTime=?2 where s.id=?3 ")
-	public void scoreVerifyTag(Integer userId, Date date, Integer studentId);
+    public void scoreVerifyTag(Integer userId, Date date, Integer studentId);
+
+    @Modifying
+    @Query("update ExamStudent s set s.trial=?3 where s.examId=?1 and s.subjectCode=?2 ")
+    public void updateTrial(Integer examId, String subjectCode, boolean trial);
 
 }

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

@@ -65,9 +65,6 @@ public interface ExamStudentService {
 
     void updateSubjectInfo(ExamSubject subject);
 
-    // void resetSubjectiveStatusAndScoreWithoutTrial(Integer examId, String
-    // subjectCode);
-
     void updateSubjectiveStatusAndScoreAndInspectorId(Integer examId, String subjectCode, SubjectiveStatus status,
             double score, String scoreList, Date inspectTime, Integer inspectorId);
 
@@ -189,8 +186,10 @@ public interface ExamStudentService {
 
     public long countByExamIdAndSubjectCodeAndTrial(int examId, String code, boolean trial);
 
-    public boolean updateTrial(Integer studentId, boolean trial);
+    public boolean updateTrialById(Integer studentId, boolean trial);
+
+    public void scoreVerifyView(Integer userId, Integer studentId);
 
-	public void scoreVerifyView(Integer userId, Integer studentId);
+    public void resetTrial(Integer examId, String subjectCode, boolean trial);
 
 }

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

@@ -469,14 +469,11 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         studentDao.updateSubjectiveStatusAndScore(id, status, score, scoreList, null, null);
     }
 
-    // @Override
-    // @Transactional
-    // public void resetSubjectiveStatusAndScoreWithoutTrial(Integer examId,
-    // String subjectCode) {
-    // studentDao.updateSubjectiveStatusAndScoreWithoutStatus(examId,
-    // subjectCode, SubjectiveStatus.UNMARK, 0, null,
-    // null, null, SubjectiveStatus.TRIAL);
-    // }
+    @Override
+    @Transactional
+    public void resetTrial(Integer examId, String subjectCode, boolean trial) {
+        studentDao.updateTrial(examId, subjectCode, trial);
+    }
 
     @Override
     @Transactional
@@ -1109,15 +1106,16 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         return originTags;
     }
 
-//    private boolean checkScore(MarkLibrary library, double score, List<Double> details) {
-//        if (library.getMarkerScore() == null) {
-//            return false;
-//        }
-//        if (library.getMarkerScore().doubleValue() != score) {
-//            return false;
-//        }
-//        return true;
-//    }
+    // private boolean checkScore(MarkLibrary library, double score,
+    // List<Double> details) {
+    // if (library.getMarkerScore() == null) {
+    // return false;
+    // }
+    // if (library.getMarkerScore().doubleValue() != score) {
+    // return false;
+    // }
+    // return true;
+    // }
 
     @Override
     public long countByExamIdAndManualAbsent(int examId, boolean manualAbsent) {
@@ -1528,13 +1526,13 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
 
     @Transactional
     @Override
-    public boolean updateTrial(Integer studentId, boolean trial) {
-        return studentDao.updateTrial(studentId, trial) > 0;
+    public boolean updateTrialById(Integer studentId, boolean trial) {
+        return studentDao.updateTrialById(studentId, trial) > 0;
     }
 
     @Transactional
-	@Override
-	public void scoreVerifyView(Integer userId, Integer studentId) {
-		studentDao.scoreVerifyTag(userId, new Date(), studentId);
-	}
+    @Override
+    public void scoreVerifyView(Integer userId, Integer studentId) {
+        studentDao.scoreVerifyTag(userId, new Date(), studentId);
+    }
 }

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

@@ -210,7 +210,7 @@ public class MarkCronService {
                         if (student == null) {
                             break;
                         }
-                        studentService.updateTrial(student.getId(), true);
+                        studentService.updateTrialById(student.getId(), true);
                         trialCount++;
                     }
                 }

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

@@ -316,8 +316,7 @@ public class MarkServiceImpl implements MarkService {
         if (groupCount == 0 || unGroupQuestionCount > 0) {
             studentService.updateSubjectiveStatusAndScoreAndInspectorId(group.getExamId(), group.getSubjectCode(),
                     SubjectiveStatus.UNMARK, 0, null, null, null);
-            // studentService.resetSubjectiveStatusAndScoreWithoutTrial(group.getExamId(),
-            // group.getSubjectCode());
+            studentService.resetTrial(group.getExamId(), group.getSubjectCode(), false);
             inspectHistoryService.deleteByExamIdAndSubjectCode(group.getExamId(), group.getSubjectCode());
         } else {
             List<Integer> studentList = studentService.findIdByExamIdAndSubjectCodeAndSubjectiveStatus(

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

@@ -261,7 +261,7 @@ public class MarkGroupController extends BaseExamController {
         if (markGroup.getStatus() == MarkStatus.TRIAL && status == MarkStatus.FORMAL) {
             allow = true;
         } else if (markGroup.getStatus() == MarkStatus.FORMAL && status == MarkStatus.FINISH
-                && markGroup.getLeftCount() == 0) {
+                && markGroup.getLeftCount() == 0 && markGroup.getLibraryCount() != 0) {
             allow = true;
         } else if (markGroup.getStatus() == MarkStatus.FINISH && status == MarkStatus.FORMAL) {
             allow = true;

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -603,7 +603,7 @@ public class MarkController extends BaseController {
             } else if (markerScore != null && exam.getRemarkCount() != null) {
                 query.setPageNumber(1);
                 query.setPageSize(exam.getRemarkCount());
-                list = list.stream().filter(e -> e.getMarkerScore().doubleValue() == markerScore)
+                list = list.stream().filter(e -> e.getMarkerScore().doubleValue() == markerScore.doubleValue())
                         .collect(Collectors.toList());
             } else {
                 query.setSecretNumber(secretNumber);

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/authInfo.jsp

@@ -30,13 +30,7 @@
 	        <label class="control-label">授权模式</label>
 	        <div class="controls">
 	        	${systemAuth.type.name }
-	        </div>
-	    </div>
-		<div class="control-group">
-	        <label class="control-label">双评轨迹</label>
-	        <div class="controls">
-	            <c:if test="${doubleTrack}">开启</c:if>
-	            <c:if test="${doubleTrack==null ||!doubleTrack}">关闭</c:if>
+	        	<c:if test="${doubleTrack}">：双评轨迹授权</c:if>
 	        </div>
 	    </div>
 	</form:form>