yin há 9 meses atrás
pai
commit
5e45df791a

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

@@ -327,7 +327,7 @@ public class MarkCronService {
     }
 
     private void buildTrialLibrary(MarkGroup group) {
-        if(MarkStatus.TRIAL == group.getStatus()){
+        if(MarkStatus.TRIAL != group.getStatus()){
             return ;
         }
         List<ExamStudent> studentList = new ArrayList<>();

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

@@ -380,7 +380,7 @@ public class MarkServiceImpl implements MarkService {
     public boolean applyLibrary(TrialLibrary library, Marker marker) {
         TaskLock taskLock = TaskLockUtil.getTrialTask(getGroupKey(marker));
         if (TrialMode.EXCLUSIVE.equals(systemCache.getTrialMode())) {
-            return taskLock.add(library.getStudentId(), library.getId(), marker.getId());
+            return taskLock.add(library.getId(), 1, marker.getId());
         } else {
             return taskLock.add(library.getStudentId(), 1, marker.getId());
         }
@@ -414,7 +414,7 @@ public class MarkServiceImpl implements MarkService {
     public boolean hasApplied(TrialLibrary library, Marker marker) {
         TaskLock taskLock = TaskLockUtil.getTrialTask(getGroupKey(marker));
         if (TrialMode.EXCLUSIVE.equals(systemCache.getTrialMode())) {
-            return true;
+            return  taskLock.exist(library.getId(), 1, marker.getId());
         } else {
             return taskLock.exist(library.getStudentId(), 1, marker.getId());
         }
@@ -438,7 +438,7 @@ public class MarkServiceImpl implements MarkService {
         } else if (result.getTrialLibrary() != null) {
             TaskLock taskLock = TaskLockUtil.getTrialTask(getGroupKey(marker));
             if (TrialMode.EXCLUSIVE.equals(systemCache.getTrialMode())) {
-                taskLock.remove(result.getTrialLibrary().getStudentId(), result.getTrialLibrary().getId(), marker.getId());
+                taskLock.remove(result.getTrialLibrary().getId(), 1, marker.getId());
             }else{
                 taskLock.remove(result.getTrialLibrary().getStudentId(), 1, marker.getId());
             }