update

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

@@ -153,10 +153,10 @@ public class MarkServiceImpl implements MarkService {
         if (group != null) {
             if (group.getStatus() == MarkStatus.FORMAL) {
                 TaskLock taskLock = TaskLockUtil.getFormalTask(getGroupKey(marker));
-                return taskLock.count(marker);
+                return taskLock.count(marker.getId());
             } else if (group.getStatus() == MarkStatus.TRIAL) {
                 TaskLock taskLock = TaskLockUtil.getTrialTask(getGroupKey(marker));
-                return taskLock.count(marker);
+                return taskLock.count(marker.getId());
             }
         }
         return 0;
@@ -319,7 +319,7 @@ public class MarkServiceImpl implements MarkService {
         // }
         // return FormalTaskUtil.add(marker, getApplyTaskId(library));
         TaskLock taskLock = TaskLockUtil.getFormalTask(getGroupKey(marker));
-        if (taskLock.add(getApplyTaskId(library), library.getTaskNumber(), marker)) {
+        if (taskLock.add(getApplyTaskId(library), library.getTaskNumber(), marker.getId())) {
             TaskLockUtil.addFormalTask(getGroupKey(marker), taskLock);
             return true;
         }
@@ -338,7 +338,7 @@ public class MarkServiceImpl implements MarkService {
     @Override
     public boolean applyLibrary(TrialLibrary library, Marker marker) {
         TaskLock taskLock = TaskLockUtil.getTrialTask(getGroupKey(marker));
-        if (taskLock.add(getApplyTaskId(library, marker), 1, marker)) {
+        if (taskLock.add(getApplyTaskId(library, marker), 1, marker.getId())) {
             TaskLockUtil.addTrialTask(getGroupKey(marker), taskLock);
             return true;
         }
@@ -357,7 +357,7 @@ public class MarkServiceImpl implements MarkService {
     @Override
     public boolean hasApplied(MarkLibrary library, Marker marker) {
         TaskLock taskLock = TaskLockUtil.getFormalTask(getGroupKey(marker));
-        return taskLock.exist(getApplyTaskId(library), library.getTaskNumber(), marker);
+        return taskLock.exist(getApplyTaskId(library), library.getTaskNumber(), marker.getId());
     }
 
     /**
@@ -372,7 +372,7 @@ public class MarkServiceImpl implements MarkService {
     @Override
     public boolean hasApplied(TrialLibrary library, Marker marker) {
         TaskLock taskLock = TaskLockUtil.getTrialTask(getGroupKey(marker));
-        return taskLock.exist(getApplyTaskId(library, marker), 1, marker);
+        return taskLock.exist(getApplyTaskId(library, marker), 1, marker.getId());
     }
 
     /**
@@ -386,8 +386,8 @@ public class MarkServiceImpl implements MarkService {
     @Override
     public void releaseLibrary(MarkLibrary library, Marker marker) {
         TaskLock taskLock = TaskLockUtil.getFormalTask(getGroupKey(marker));
-        taskLock.remove(getApplyTaskId(library), library.getTaskNumber(), marker);
-        taskLock.refresh(marker);
+        taskLock.remove(getApplyTaskId(library), library.getTaskNumber(), marker.getId());
+        taskLock.refresh(marker.getId());
         TaskLockUtil.addFormalTask(getGroupKey(marker), taskLock);
     }
 
@@ -402,7 +402,7 @@ public class MarkServiceImpl implements MarkService {
     @Override
     public void releaseLibrary(TrialLibrary library, Marker marker) {
         TaskLock taskLock = TaskLockUtil.getTrialTask(getGroupKey(marker));
-        taskLock.remove(getApplyTaskId(library, marker), 1, marker);
+        taskLock.remove(getApplyTaskId(library, marker), 1, marker.getId());
         TaskLockUtil.addTrialTask(getGroupKey(marker), taskLock);
     }
 
@@ -415,7 +415,7 @@ public class MarkServiceImpl implements MarkService {
     @Override
     public void releaseByMarker(Marker marker) {
         TaskLock taskLock = TaskLockUtil.getFormalTask(getGroupKey(marker));
-        taskLock.clear(marker);
+        taskLock.clear(marker.getId());
         TaskLockUtil.addFormalTask(getGroupKey(marker), taskLock);
     }