Merge remote-tracking branch 'origin/dev_v2.1.0' into dev_v2.1.0

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -63,6 +63,7 @@ public class SystemConstant {
     public static final String MANUAL = "manual";
     public static final String DELIMITER = ":";
     public static final int FINAL_SCALE = 1;
+    public static final int CALCULATE_SCALE = 4;
     public static final int OPER_SCALE = 8;
     public static final String HYPHEN = "-";
     public static final String DEFAULT_SIGN = "#";

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/excel/TAExamCourseDto.java

@@ -159,7 +159,7 @@ public class TAExamCourseDto implements Serializable {
 
     public BigDecimal getAvgScore() {
         if (Objects.nonNull(avgScore)) {
-            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return avgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return avgScore;
         }
@@ -187,7 +187,7 @@ public class TAExamCourseDto implements Serializable {
 
     public BigDecimal getPaperCurrentAvgScore() {
         if (Objects.nonNull(paperCurrentAvgScore)) {
-            return paperCurrentAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return paperCurrentAvgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return paperCurrentAvgScore;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/query/BasicAnswerDto.java

@@ -78,7 +78,7 @@ public class BasicAnswerDto {
 
     public BigDecimal getScore() {
         if (Objects.nonNull(score)) {
-            return score.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return score.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return score;
         }
@@ -138,7 +138,7 @@ public class BasicAnswerDto {
 
     public BigDecimal getSubjectiveScore() {
         if (Objects.nonNull(subjectiveScore)) {
-            return subjectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return subjectiveScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return subjectiveScore;
         }
@@ -150,7 +150,7 @@ public class BasicAnswerDto {
 
     public BigDecimal getObjectiveScore() {
         if (Objects.nonNull(objectiveScore)) {
-            return objectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return objectiveScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return objectiveScore;
         }
@@ -162,7 +162,7 @@ public class BasicAnswerDto {
 
     public BigDecimal getTotalScore() {
         if (Objects.nonNull(totalScore)) {
-            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return totalScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return totalScore;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/query/BasicExamRecordDto.java

@@ -179,7 +179,7 @@ public class BasicExamRecordDto {
 
     public BigDecimal getSubjectiveScore() {
         if (Objects.nonNull(subjectiveScore)) {
-            return subjectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return subjectiveScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return subjectiveScore;
         }
@@ -191,7 +191,7 @@ public class BasicExamRecordDto {
 
     public BigDecimal getObjectiveScore() {
         if (Objects.nonNull(objectiveScore)) {
-            return objectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return objectiveScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return objectiveScore;
         }
@@ -203,7 +203,7 @@ public class BasicExamRecordDto {
 
     public BigDecimal getTotalScore() {
         if (Objects.nonNull(totalScore)) {
-            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return totalScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return totalScore;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/query/ValidAnswerDetailDto.java

@@ -65,7 +65,7 @@ public class ValidAnswerDetailDto {
 
     public BigDecimal getScore() {
         if (Objects.nonNull(score)) {
-            return score.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return score.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return score;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourse.java

@@ -323,7 +323,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getAvgScore() {
         if (Objects.nonNull(avgScore)) {
-            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return avgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return avgScore;
         }
@@ -359,7 +359,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentPassRate() {
         if (Objects.nonNull(currentPassRate)) {
-            return currentPassRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentPassRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentPassRate;
         }
@@ -371,7 +371,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getTotalScore() {
         if (Objects.nonNull(totalScore)) {
-            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return totalScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return totalScore;
         }
@@ -407,7 +407,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentMinScore() {
         if (Objects.nonNull(currentMinScore)) {
-            return currentMinScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentMinScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentMinScore;
         }
@@ -419,7 +419,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentMaxScore() {
         if (Objects.nonNull(currentMaxScore)) {
-            return currentMaxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentMaxScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentMaxScore;
         }
@@ -431,7 +431,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentAvgScore() {
         if (Objects.nonNull(currentAvgScore)) {
-            return currentAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentAvgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentAvgScore;
         }
@@ -443,7 +443,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentScoreRate() {
         if (Objects.nonNull(currentScoreRate)) {
-            return currentScoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentScoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentScoreRate;
         }
@@ -479,7 +479,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentRealityRate() {
         if (Objects.nonNull(currentRealityRate)) {
-            return currentRealityRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentRealityRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentRealityRate;
         }
@@ -515,7 +515,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getPastRealityRate() {
         if (Objects.nonNull(pastRealityRate)) {
-            return pastRealityRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return pastRealityRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return pastRealityRate;
         }
@@ -527,7 +527,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentUpperQuartile() {
         if (Objects.nonNull(currentUpperQuartile)) {
-            return currentUpperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentUpperQuartile.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentUpperQuartile;
         }
@@ -539,7 +539,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentMedian() {
         if (Objects.nonNull(currentMedian)) {
-            return currentMedian.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentMedian.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentMedian;
         }
@@ -551,7 +551,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentLowerQuartile() {
         if (Objects.nonNull(currentLowerQuartile)) {
-            return currentLowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentLowerQuartile.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentLowerQuartile;
         }
@@ -571,7 +571,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCurrentStandardDeviation() {
         if (Objects.nonNull(currentStandardDeviation)) {
-            return currentStandardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return currentStandardDeviation.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return currentStandardDeviation;
         }
@@ -591,7 +591,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getPaperAvgScore() {
         if (Objects.nonNull(paperAvgScore)) {
-            return paperAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return paperAvgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return paperAvgScore;
         }
@@ -603,7 +603,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getPaperCurrentAvgScore() {
         if (Objects.nonNull(paperCurrentAvgScore)) {
-            return paperCurrentAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return paperCurrentAvgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return paperCurrentAvgScore;
         }
@@ -615,7 +615,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getPaperPassRate() {
         if (Objects.nonNull(paperPassRate)) {
-            return paperPassRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return paperPassRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return paperPassRate;
         }
@@ -627,7 +627,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getPaperCurrentPassRate() {
         if (Objects.nonNull(paperCurrentPassRate)) {
-            return paperCurrentPassRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return paperCurrentPassRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return paperCurrentPassRate;
         }
@@ -639,7 +639,7 @@ public class TAExamCourse implements Serializable {
 
     public BigDecimal getCoefficient() {
         if (Objects.nonNull(coefficient)) {
-            return coefficient.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return coefficient.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return coefficient;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseClazz.java

@@ -135,7 +135,7 @@ public class TAExamCourseClazz implements Serializable {
 
     public BigDecimal getMaxScore() {
         if (Objects.nonNull(maxScore)) {
-            return maxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return maxScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return maxScore;
         }
@@ -147,7 +147,7 @@ public class TAExamCourseClazz implements Serializable {
 
     public BigDecimal getMinScore() {
         if (Objects.nonNull(minScore)) {
-            return minScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return minScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return minScore;
         }
@@ -159,7 +159,7 @@ public class TAExamCourseClazz implements Serializable {
 
     public BigDecimal getAvgScore() {
         if (Objects.nonNull(avgScore)) {
-            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return avgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return avgScore;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseCollegeInspect.java

@@ -155,7 +155,7 @@ public class TAExamCourseCollegeInspect implements Serializable {
 
     public BigDecimal getMaxScore() {
         if (Objects.nonNull(maxScore)) {
-            return maxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return maxScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return maxScore;
         }
@@ -167,7 +167,7 @@ public class TAExamCourseCollegeInspect implements Serializable {
 
     public BigDecimal getMinScore() {
         if (Objects.nonNull(minScore)) {
-            return minScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return minScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return minScore;
         }
@@ -179,7 +179,7 @@ public class TAExamCourseCollegeInspect implements Serializable {
 
     public BigDecimal getAvgScore() {
         if (Objects.nonNull(avgScore)) {
-            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return avgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return avgScore;
         }
@@ -215,7 +215,7 @@ public class TAExamCourseCollegeInspect implements Serializable {
 
     public BigDecimal getUpperQuartile() {
         if (Objects.nonNull(upperQuartile)) {
-            return upperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return upperQuartile.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return upperQuartile;
         }
@@ -227,7 +227,7 @@ public class TAExamCourseCollegeInspect implements Serializable {
 
     public BigDecimal getMedian() {
         if (Objects.nonNull(median)) {
-            return median.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return median.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return median;
         }
@@ -239,7 +239,7 @@ public class TAExamCourseCollegeInspect implements Serializable {
 
     public BigDecimal getLowerQuartile() {
         if (Objects.nonNull(lowerQuartile)) {
-            return lowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return lowerQuartile.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return lowerQuartile;
         }
@@ -263,7 +263,7 @@ public class TAExamCourseCollegeInspect implements Serializable {
 
     public BigDecimal getStandardDeviation() {
         if (Objects.nonNull(standardDeviation)) {
-            return standardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return standardDeviation.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return standardDeviation;
         }
@@ -275,7 +275,7 @@ public class TAExamCourseCollegeInspect implements Serializable {
 
     public BigDecimal getRelativePosition() {
         if (Objects.nonNull(relativePosition)) {
-            return relativePosition.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return relativePosition.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return relativePosition;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseCollegeInspectDio.java

@@ -151,7 +151,7 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
 
     public BigDecimal getAvgScore() {
         if (Objects.nonNull(avgScore)) {
-            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return avgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return avgScore;
         }
@@ -163,7 +163,7 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
 
     public BigDecimal getScoreRate() {
         if (Objects.nonNull(scoreRate)) {
-            return scoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return scoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return scoreRate;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseCollegeTeacher.java

@@ -189,7 +189,7 @@ public class TAExamCourseCollegeTeacher implements Serializable {
 
     public BigDecimal getMinScoreAssign() {
         if (Objects.nonNull(minScoreAssign)) {
-            return minScoreAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return minScoreAssign.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return minScoreAssign;
         }
@@ -201,7 +201,7 @@ public class TAExamCourseCollegeTeacher implements Serializable {
 
     public BigDecimal getMaxScoreAssign() {
         if (Objects.nonNull(maxScoreAssign)) {
-            return maxScoreAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return maxScoreAssign.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return maxScoreAssign;
         }
@@ -213,7 +213,7 @@ public class TAExamCourseCollegeTeacher implements Serializable {
 
     public BigDecimal getAvgScoreAssign() {
         if (Objects.nonNull(avgScoreAssign)) {
-            return avgScoreAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return avgScoreAssign.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return avgScoreAssign;
         }
@@ -225,7 +225,7 @@ public class TAExamCourseCollegeTeacher implements Serializable {
 
     public BigDecimal getAvgScore() {
         if (Objects.nonNull(avgScore)) {
-            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return avgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return avgScore;
         }
@@ -237,7 +237,7 @@ public class TAExamCourseCollegeTeacher implements Serializable {
 
     public BigDecimal getUpperQuartile() {
         if (Objects.nonNull(upperQuartile)) {
-            return upperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return upperQuartile.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return upperQuartile;
         }
@@ -249,7 +249,7 @@ public class TAExamCourseCollegeTeacher implements Serializable {
 
     public BigDecimal getMedian() {
         if (Objects.nonNull(median)) {
-            return median.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return median.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return median;
         }
@@ -261,7 +261,7 @@ public class TAExamCourseCollegeTeacher implements Serializable {
 
     public BigDecimal getLowerQuartile() {
         if (Objects.nonNull(lowerQuartile)) {
-            return lowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return lowerQuartile.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return lowerQuartile;
         }
@@ -281,7 +281,7 @@ public class TAExamCourseCollegeTeacher implements Serializable {
 
     public BigDecimal getStandardDeviation() {
         if (Objects.nonNull(standardDeviation)) {
-            return standardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return standardDeviation.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return standardDeviation;
         }
@@ -293,7 +293,7 @@ public class TAExamCourseCollegeTeacher implements Serializable {
 
     public BigDecimal getRelativePosition() {
         if (Objects.nonNull(relativePosition)) {
-            return relativePosition.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return relativePosition.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return relativePosition;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseDifficult.java

@@ -176,7 +176,7 @@ public class TAExamCourseDifficult implements Serializable {
 
     public BigDecimal getSchAvgScoreRate() {
         if (Objects.nonNull(schAvgScoreRate)) {
-            return schAvgScoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return schAvgScoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return schAvgScoreRate;
         }
@@ -188,7 +188,7 @@ public class TAExamCourseDifficult implements Serializable {
 
     public BigDecimal getColAvgScoreRate() {
         if (Objects.nonNull(colAvgScoreRate)) {
-            return colAvgScoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return colAvgScoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return colAvgScoreRate;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseDio.java

@@ -143,7 +143,7 @@ public class TAExamCourseDio implements Serializable {
 
     public BigDecimal getScoreRate() {
         if (Objects.nonNull(scoreRate)) {
-            return scoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return scoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return scoreRate;
         }
@@ -155,7 +155,7 @@ public class TAExamCourseDio implements Serializable {
 
     public BigDecimal getTotalScore() {
         if (Objects.nonNull(totalScore)) {
-            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return totalScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return totalScore;
         }
@@ -167,7 +167,7 @@ public class TAExamCourseDio implements Serializable {
 
     public BigDecimal getTotalCount() {
         if (Objects.nonNull(totalCount)) {
-            return totalCount.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return totalCount.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return totalCount;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecord.java

@@ -146,7 +146,7 @@ public class TAExamCourseRecord implements Serializable {
 
     public BigDecimal getAssignedScore() {
         if (Objects.nonNull(assignedScore)) {
-            return assignedScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return assignedScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return assignedScore;
         }
@@ -190,7 +190,7 @@ public class TAExamCourseRecord implements Serializable {
 
     public BigDecimal getOverCollegeRate() {
         if (Objects.nonNull(overCollegeRate)) {
-            return overCollegeRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return overCollegeRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return overCollegeRate;
         }
@@ -202,7 +202,7 @@ public class TAExamCourseRecord implements Serializable {
 
     public BigDecimal getStandardizedCoefficients() {
         if (Objects.nonNull(standardizedCoefficients)) {
-            return standardizedCoefficients.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return standardizedCoefficients.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return standardizedCoefficients;
         }
@@ -302,7 +302,7 @@ public class TAExamCourseRecord implements Serializable {
 
     public BigDecimal getTotalScore() {
         if (Objects.nonNull(totalScore)) {
-            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return totalScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return totalScore;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecordDio.java

@@ -151,7 +151,7 @@ public class TAExamCourseRecordDio implements Serializable {
 
     public BigDecimal getStudentScore() {
         if (Objects.nonNull(studentScore)) {
-            return studentScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return studentScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return studentScore;
         }
@@ -163,7 +163,7 @@ public class TAExamCourseRecordDio implements Serializable {
 
     public BigDecimal getScoreRate() {
         if (Objects.nonNull(scoreRate)) {
-            return scoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return scoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return scoreRate;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecordMod.java

@@ -146,7 +146,7 @@ public class TAExamCourseRecordMod implements Serializable {
 
     public BigDecimal getTotalScore() {
         if (Objects.nonNull(totalScore)) {
-            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return totalScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return totalScore;
         }
@@ -158,7 +158,7 @@ public class TAExamCourseRecordMod implements Serializable {
 
     public BigDecimal getScoreRate() {
         if (Objects.nonNull(scoreRate)) {
-            return scoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return scoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return scoreRate;
         }
@@ -170,7 +170,7 @@ public class TAExamCourseRecordMod implements Serializable {
 
     public BigDecimal getFullScore() {
         if (Objects.nonNull(fullScore)) {
-            return fullScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return fullScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return fullScore;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseTeacher.java

@@ -167,7 +167,7 @@ public class TAExamCourseTeacher implements Serializable {
 
     public BigDecimal getMinScore() {
         if (Objects.nonNull(minScore)) {
-            return minScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return minScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return minScore;
         }
@@ -179,7 +179,7 @@ public class TAExamCourseTeacher implements Serializable {
 
     public BigDecimal getMaxScore() {
         if (Objects.nonNull(maxScore)) {
-            return maxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return maxScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return maxScore;
         }
@@ -191,7 +191,7 @@ public class TAExamCourseTeacher implements Serializable {
 
     public BigDecimal getAvgScore() {
         if (Objects.nonNull(avgScore)) {
-            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return avgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return avgScore;
         }
@@ -203,7 +203,7 @@ public class TAExamCourseTeacher implements Serializable {
 
     public BigDecimal getUpperQuartile() {
         if (Objects.nonNull(upperQuartile)) {
-            return upperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return upperQuartile.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return upperQuartile;
         }
@@ -215,7 +215,7 @@ public class TAExamCourseTeacher implements Serializable {
 
     public BigDecimal getMedian() {
         if (Objects.nonNull(median)) {
-            return median.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return median.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return median;
         }
@@ -227,7 +227,7 @@ public class TAExamCourseTeacher implements Serializable {
 
     public BigDecimal getLowerQuartile() {
         if (Objects.nonNull(lowerQuartile)) {
-            return lowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return lowerQuartile.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return lowerQuartile;
         }
@@ -247,7 +247,7 @@ public class TAExamCourseTeacher implements Serializable {
 
     public BigDecimal getStandardDeviation() {
         if (Objects.nonNull(standardDeviation)) {
-            return standardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return standardDeviation.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return standardDeviation;
         }
@@ -259,7 +259,7 @@ public class TAExamCourseTeacher implements Serializable {
 
     public BigDecimal getRelativePosition() {
         if (Objects.nonNull(relativePosition)) {
-            return relativePosition.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return relativePosition.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return relativePosition;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseTeacherDifficult.java

@@ -172,7 +172,7 @@ public class TAExamCourseTeacherDifficult implements Serializable {
 
     public BigDecimal getSchAvgScoreRate() {
         if (Objects.nonNull(schAvgScoreRate)) {
-            return schAvgScoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return schAvgScoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return schAvgScoreRate;
         }
@@ -184,7 +184,7 @@ public class TAExamCourseTeacherDifficult implements Serializable {
 
     public BigDecimal getTeaAvgScoreRate() {
         if (Objects.nonNull(teaAvgScoreRate)) {
-            return teaAvgScoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return teaAvgScoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return teaAvgScoreRate;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseTeacherDio.java

@@ -151,7 +151,7 @@ public class TAExamCourseTeacherDio implements Serializable {
 
     public BigDecimal getAvgScore() {
         if (Objects.nonNull(avgScore)) {
-            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return avgScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return avgScore;
         }
@@ -163,7 +163,7 @@ public class TAExamCourseTeacherDio implements Serializable {
 
     public BigDecimal getScoreRate() {
         if (Objects.nonNull(scoreRate)) {
-            return scoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return scoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return scoreRate;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAPaperStruct.java

@@ -216,7 +216,7 @@ public class TAPaperStruct implements Serializable {
 
     public BigDecimal getFullScore() {
         if (Objects.nonNull(fullScore)) {
-            return fullScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return fullScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return fullScore;
         }
@@ -268,7 +268,7 @@ public class TAPaperStruct implements Serializable {
 
     public BigDecimal getScoreRate() {
         if (Objects.nonNull(scoreRate)) {
-            return scoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return scoreRate.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return scoreRate;
         }
@@ -288,7 +288,7 @@ public class TAPaperStruct implements Serializable {
 
     public BigDecimal getValidity() {
         if (Objects.nonNull(validity)) {
-            return validity.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return validity.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return validity;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBAnswer.java

@@ -117,7 +117,7 @@ public class TBAnswer implements Serializable {
 
     public BigDecimal getScore() {
         if (Objects.nonNull(score)) {
-            return score.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return score.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return score;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBCommonLevelConfig.java

@@ -152,7 +152,7 @@ public class TBCommonLevelConfig implements Serializable {
 
     public BigDecimal getMin() {
         if (Objects.nonNull(min)) {
-            return min.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return min.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return min;
         }
@@ -164,7 +164,7 @@ public class TBCommonLevelConfig implements Serializable {
 
     public BigDecimal getMax() {
         if (Objects.nonNull(max)) {
-            return max.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return max.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return max;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBCommonRankLevelConfig.java

@@ -124,7 +124,7 @@ public class TBCommonRankLevelConfig implements Serializable {
 
     public BigDecimal getMin() {
         if (Objects.nonNull(min)) {
-            return min.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return min.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return min;
         }
@@ -136,7 +136,7 @@ public class TBCommonRankLevelConfig implements Serializable {
 
     public BigDecimal getMax() {
         if (Objects.nonNull(max)) {
-            return max.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return max.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return max;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBExamRecord.java

@@ -107,7 +107,7 @@ public class TBExamRecord implements Serializable {
 
     public BigDecimal getSubjectiveScore() {
         if (Objects.nonNull(subjectiveScore)) {
-            return subjectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return subjectiveScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return subjectiveScore;
         }
@@ -119,7 +119,7 @@ public class TBExamRecord implements Serializable {
 
     public BigDecimal getObjectiveScore() {
         if (Objects.nonNull(objectiveScore)) {
-            return objectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return objectiveScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return objectiveScore;
         }
@@ -131,7 +131,7 @@ public class TBExamRecord implements Serializable {
 
     public BigDecimal getTotalScore() {
         if (Objects.nonNull(totalScore)) {
-            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return totalScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return totalScore;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBPaper.java

@@ -134,7 +134,7 @@ public class TBPaper implements Serializable {
 
     public BigDecimal getCoefficient() {
         if (Objects.nonNull(coefficient)) {
-            return coefficient.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return coefficient.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return coefficient;
         }
@@ -146,7 +146,7 @@ public class TBPaper implements Serializable {
 
     public BigDecimal getTotalScore() {
         if (Objects.nonNull(totalScore)) {
-            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return totalScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return totalScore;
         }
@@ -158,7 +158,7 @@ public class TBPaper implements Serializable {
 
     public BigDecimal getPassScore() {
         if (Objects.nonNull(passScore)) {
-            return passScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return passScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return passScore;
         }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBPaperStruct.java

@@ -141,7 +141,7 @@ public class TBPaperStruct implements Serializable {
 
     public BigDecimal getFullScore() {
         if (Objects.nonNull(fullScore)) {
-            return fullScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+            return fullScore.setScale(SystemConstant.CALCULATE_SCALE, BigDecimal.ROUND_HALF_UP);
         } else {
             return fullScore;
         }

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/BasicDatasourceController.java

@@ -727,6 +727,9 @@ public class BasicDatasourceController {
                 // 迁移数据至't_a_exam_course_record'
                 List<TAExamCourseRecord> taExamCourseRecordList = new ArrayList<>();
                 for (BasicExamRecordDto basicExamRecordDto : basicExamRecordDtoList) {
+                    if (basicExamRecordDto.getStudentCode().equals("2020303041027")){
+                        System.out.println("进入");
+                    }
                     // 正常公式赋分操作
                     Long paperId = basicExamRecordDto.getPaperId();
                     TBPaper tbPaper = tbPaperService.getById(paperId);