3.3.0 update

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

@@ -112,7 +112,7 @@ public class MarkQuestionController {
     @RequestMapping(value = "/subjective/get", method = RequestMethod.POST)
     public Result getSubjective(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                 @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) {
-        return ResultUtil.ok(markQuestionService.previewAnswerFileByExamIdAndPaperNumber(examId, paperNumber));
+        return ResultUtil.ok(markQuestionService.previewAnswerFileByExamIdAndPaperNumber(examId, paperNumber), null);
     }
 
     /**

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkUserClassService.java

@@ -29,7 +29,7 @@ public interface MarkUserClassService extends IService<MarkUserClass> {
 
     boolean saveMarkClassUser(MarkClassUserParams markClassUserParams);
 
-    boolean deleteByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer groupNumber);
+    boolean deleteByExamIdAndPaperNumberAndGroupNumberAndClassName(Long examId, String paperNumber, Integer groupNumber, String className);
 
     List<MarkUserClass> listByExamIdAndPaperNumber(Long examId, String paperNumber);
 

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

@@ -82,7 +82,7 @@ public class MarkPaperServiceImpl extends ServiceImpl<MarkPaperMapper, MarkPaper
                 .set(MarkPaper::getMarkStartTime, markPaper.getMarkStartTime())
                 .set(MarkPaper::getMarkEndTime, markPaper.getMarkEndTime())
                 .set(MarkPaper::getSheetView, markPaper.getSheetView())
-                .set(MarkPaper::getShowObjectScore, markPaper.getObjectiveScore())
+                .set(MarkPaper::getShowObjectScore, markPaper.getShowObjectScore())
                 .set(MarkPaper::getAutoScroll, markPaper.getAutoScroll())
                 .set(MarkPaper::getPassScore, markPaper.getPassScore())
                 .set(MarkPaper::getExcellentScore, markPaper.getExcellentScore())

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

@@ -109,17 +109,18 @@ public class MarkUserClassServiceImpl extends ServiceImpl<MarkUserClassMapper, M
             markUserClass.setUserId(markUser.getUserId());
             markUserClasses.add(markUserClass);
         }
-        this.deleteByExamIdAndPaperNumberAndGroupNumber(examId, paperNumber, groupNumber);
+        this.deleteByExamIdAndPaperNumberAndGroupNumberAndClassName(examId, paperNumber, groupNumber, className);
         this.saveBatch(markUserClasses);
         return true;
     }
 
     @Override
-    public boolean deleteByExamIdAndPaperNumberAndGroupNumber(Long examId, String paperNumber, Integer groupNumber) {
+    public boolean deleteByExamIdAndPaperNumberAndGroupNumberAndClassName(Long examId, String paperNumber, Integer groupNumber, String className) {
         UpdateWrapper<MarkUserClass> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().eq(MarkUserClass::getExamId, examId)
                 .eq(MarkUserClass::getPaperNumber, paperNumber)
-                .eq(MarkUserClass::getGroupNumber, groupNumber);
+                .eq(MarkUserClass::getGroupNumber, groupNumber)
+                .eq(MarkUserClass::getClassName, className);
         return this.remove(updateWrapper);
     }