修改MarkService重置评卷员任务的锁方式

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

@@ -259,16 +259,18 @@ public class MarkServiceImpl implements MarkService {
     @Transactional
     public void resetMarker(Marker marker) {
         try {
-            lockService.lockGroup(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
-            releaseByMarker(marker);
+            lockService.waitUnlockGroup(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
+            lockService.lockMarker(marker.getId());
+
             libraryDao.resetByMarkerId(marker.getId(), LibraryStatus.WAITING);
             trackDao.deleteByMarkerId(marker.getId());
             specialTagDao.deleteByMarkerId(marker.getId());
             updateLibraryCount(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
+            releaseByMarker(marker);
         } catch (Exception e) {
             throw e;
         } finally {
-            lockService.unlockGroup(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
+            lockService.unlockMarker(marker.getId());
         }
     }