Merge remote-tracking branch 'origin/dev_v3.3.1' into dev_v3.3.1

distributed-print/src/main/java/com/qmth/distributed/print/api/TCPaperStructController.java

@@ -157,7 +157,7 @@ public class TCPaperStructController {
             Objects.requireNonNull(c.getTotalWeight(), "[" + c.getCourseTargetName() + "]未设置权重");
             Objects.requireNonNull(c.getTotalScore(), "[" + c.getCourseTargetName() + "]未设置目标分值");
             if (new BigDecimal(score).compareTo(c.getTotalWeight()) == 1) {
-                throw ExceptionResultEnum.ERROR.exception("[" + c.getCourseTargetName() + "]知识点小题总分大于该课程目标分，请重新设置");
+                throw ExceptionResultEnum.ERROR.exception("[" + c.getCourseTargetName() + "]包含的小题总分与权重设置不一致，请到期末成绩--试卷蓝图设置里调整");
             }
             paperStructDimensionResultList.stream().filter(s -> {
                 if (Objects.equals(s.getCourseTargetName(), c.getCourseTargetName())) {
@@ -193,7 +193,6 @@ public class TCPaperStructController {
     public Result finalScorePaperStructQuery(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                                              @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                              @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
-        printCommonService.getLock(examId, courseCode, paperNumber);
         List<PaperStructDimensionResult> paperStructDimensionResultList = null;
         TCPaperStruct tcPaperStruct = tcPaperStructService.queryByExamIdAndCourseCodeAndPaperNumber(examId, courseCode, paperNumber);
         if (Objects.isNull(tcPaperStruct) || (Objects.isNull(tcPaperStruct.getPaperStruct()) && Objects.isNull(tcPaperStruct.getPaperStructDimension()))) {

distributed-print/src/main/java/com/qmth/distributed/print/api/TRBasicInfoController.java

@@ -126,7 +126,7 @@ public class TRBasicInfoController {
                 Objects.requireNonNull(c.getTotalScore(), "[" + c.getCourseTargetName() + "]未设置目标分值");
                 if (new BigDecimal(score).compareTo(c.getTotalWeight()) == 1) {
                     trBasicInfoService.clearReportData(examId, courseCode, paperNumber, false);
-                    throw ExceptionResultEnum.ERROR.exception("[" + c.getCourseTargetName() + "]知识点小题总分大于该课程目标分，请重新设置");
+                    throw ExceptionResultEnum.ERROR.exception("[" + c.getCourseTargetName() + "]包含的小题总分与权重设置不一致，请到期末成绩--试卷蓝图设置里调整");
                 }
             }
         }
@@ -209,7 +209,7 @@ public class TRBasicInfoController {
                     Objects.requireNonNull(c.getTotalScore(), "[" + c.getCourseTargetName() + "]未设置目标分值");
                     if (new BigDecimal(score).compareTo(c.getTotalWeight()) == 1) {
                         trBasicInfoService.clearReportData(examId, courseCode, paperNumber, false);
-                        throw ExceptionResultEnum.ERROR.exception("[" + c.getCourseTargetName() + "]知识点小题总分大于该课程目标分，请重新设置");
+                        throw ExceptionResultEnum.ERROR.exception("[" + c.getCourseTargetName() + "]包含的小题总分与权重设置不一致，请到期末成绩--试卷蓝图设置里调整");
                     }
                 }
             }
@@ -359,7 +359,7 @@ public class TRBasicInfoController {
                             stringJoiner.add("[").add(c.getCourseTargetName()).add("]").add("未设置目标分值").add("\r\n");
                         } else if (new BigDecimal(score).compareTo(c.getTotalWeight()) == 1) {
                             reportChangeResult.setTargetScoreChange(true);
-                            stringJoiner.add("[").add(c.getCourseTargetName()).add("]").add("知识点小题总分大于该课程目标分，请重新设置").add("\r\n");
+                            stringJoiner.add("[").add(c.getCourseTargetName()).add("]").add("包含的小题总分与权重设置不一致，请到期末成绩--试卷蓝图设置里调整").add("\r\n");
                         }
                     }
                     if (reportChangeResult.isTargetScoreChange()) {