3.3.0 fix

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -286,9 +286,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             BasicCardRule basicCardRule = basicCardRuleService.getById(examTask.getCardRuleId());
 
             //试卷编号本考场使用卷型key
-            StringJoiner stringJoiner = new StringJoiner("_");
-            stringJoiner.add(String.valueOf(examPrintPlan.getExamId())).add(examDetailCourse.getPaperNumber()).add(String.valueOf(examDetail.getExamStartTime())).add(String.valueOf(examDetail.getExamEndTime()));
-            String key = stringJoiner.toString();
+            String key = getPaperTypeKey(examDetail.getExamId(), examDetailCourse.getPaperNumber(), examDetail.getExamStartTime(), examDetail.getExamEndTime());
 
             //抽取卷型
             String paperType;
@@ -448,6 +446,13 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         return basicAttachmentList;
     }
 
+    private static  String getPaperTypeKey(Long examId, String paperNumber, Long examStartTime, Long examEndTime){
+        //试卷编号本考场使用卷型key
+        StringJoiner stringJoiner = new StringJoiner("_");
+        stringJoiner.add(String.valueOf(examId)).add(paperNumber).add(String.valueOf(examStartTime)).add(String.valueOf(examEndTime));
+        return stringJoiner.toString();
+    }
+
     /**
      * 创建A4文件
      *

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkUserGroupController.java

@@ -84,12 +84,7 @@ public class MarkUserGroupController {
     @ApiOperation(value = "重置评卷员")
     @RequestMapping(value = "/reset", method = RequestMethod.POST)
     public Result resetMarker(@ApiParam(value = "考试ID", required = true) @RequestParam Long markUserGroupId) {
-        boolean resetMarker = markUserGroupService.resetMarker(markUserGroupId);
-        if (resetMarker) {
-            return ResultUtil.ok(true);
-        } else {
-            return ResultUtil.error(ExceptionResultEnum.ERROR.getCode(), "评卷员正在重置");
-        }
+        return ResultUtil.ok(markUserGroupService.resetMarker(markUserGroupId));
     }
 
     /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserGroupServiceImpl.java

@@ -101,7 +101,7 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
             record.setGroupQuestions(markQuestionService.assembleGroupQuestionsByExamIdAndPaperNumberAndNumber(examId, paperNumber, record.getGroupNumber()));
             List<MarkTask> markTaskList = markTaskService.listByExamIdAndPaperNumberAndGroupNumberAndUserIdAndClassName(examId, paperNumber, record.getGroupNumber(), record.getUserId(), null);
 //            record.setTaskCount(markTaskList.size());
-            record.setResetting(lockService.trylock(LockType.MARKER_RESET, record.getMarkUserGroupId()));
+            record.setResetting(lockService.isLocked(LockType.MARKER_RESET, record.getMarkUserGroupId()));
             record.setMarkedCount(markTaskService.markedCount(markTaskList));
             MarkGroup markGroup = markGroupService.getByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, record.getGroupNumber());
             record.setCurrentCount(markService.applyCurrentCount(markGroup, record.getMarkUserGroupId()));
@@ -185,7 +185,7 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
                 markSyncService.markerResetSync(markUserGroup);
                 return true;
             } else {
-                return false;
+                throw ExceptionResultEnum.ERROR.exception("评卷员正在重置");
             }
         }
         return true;