Merge branch 'dev_v2.1.0' into release_v2.1.0

merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncPaperReviewPdfExportService.java

@@ -2,7 +2,6 @@ package com.qmth.distributed.print.business.templete.execute;
 
 import cn.hutool.core.date.DateUtil;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.templete.export.AsyncExportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
@@ -20,7 +19,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.MessageFormat;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.StringJoiner;
 

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 = "#";
@@ -142,7 +143,7 @@ public class SystemConstant {
      * 线程池配置
      */
     public static final String THREAD_POOL_NAME = "taskThreadPool";
-//    public static final int THREAD_POOL_CORE_POOL_SIZE = 5;
+    //    public static final int THREAD_POOL_CORE_POOL_SIZE = 5;
 //    public static final int THREAD_POOL_MAX_POOL_SIZE = 100;
     public static final int THREAD_POOL_KEEP_ALIVE_SECONDS = 10;
     public static final int THREAD_POOL_QUEUE_CAPACITY = 500;
@@ -216,28 +217,45 @@ public class SystemConstant {
 
     /**
      * 模糊查询时调用以去除符号"%","_"特殊字符对查询结果的影响
+     *
      * @param param 要校验的参数
      * @return 转译后的参数
      */
-    public static String translateSpecificSign(String param){
-        if (param == null){
+    public static String translateSpecificSign(String param) {
+        if (param == null) {
             return null;
         }
-        if (param.contains("%")){
-            param = param.replaceAll("%","\\\\%");
+        if (param.contains("%")) {
+            param = param.replaceAll("%", "\\\\%");
         }
-        if (param.contains("_")){
-            param = param.replaceAll("_","\\\\_");
+        if (param.contains("_")) {
+            param = param.replaceAll("_", "\\\\_");
         }
         return param;
     }
 
-    public static void verifyLength(String str,int length,String name){
-        if (str == null || str.length() == 0 || str.equals("null")){
+    public static void verifyLength(String str, int length, String name) {
+        if (str == null || str.length() == 0 || str.equals("null")) {
             throw ExceptionResultEnum.ERROR.exception(name + "不能为空");
         }
-        if (str.length() > length){
+        if (str.length() > length) {
             throw ExceptionResultEnum.ERROR.exception("[" + name + ":" + str + "]' 超过长度限制 : " + length);
         }
     }
+
+    /**
+     * 获取排序列名
+     *
+     * @param column
+     * @return
+     */
+    public static String getOrderColumn(String column) {
+        if (Objects.nonNull(column) && Objects.equals(column, "inspectCollegeName")) {
+            return "inspect_college_name";
+        } else if (Objects.nonNull(column) && Objects.equals(column, "teacherName")) {
+            return "teacher_name";
+        } else {
+            return null;
+        }
+    }
 }

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-business/src/main/java/com/qmth/teachcloud/report/business/enums/OrderEnum.java

@@ -0,0 +1,42 @@
+package com.qmth.teachcloud.report.business.enums;
+
+import java.util.Objects;
+
+/**
+ * @Description: 排序enum
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/6/21
+ */
+public enum OrderEnum {
+
+    ASC("正序"),
+
+    DESC("倒序");
+
+    private String title;
+
+    private OrderEnum(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 状态转换 toName
+     *
+     * @param title
+     * @return
+     */
+    public static String convertToName(String title) {
+        for (OrderEnum e : OrderEnum.values()) {
+            if (Objects.equals(title, e.getTitle())) {
+                return e.name();
+            }
+        }
+        return null;
+    }
+}

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TAExamCourseCollegeTeacherMapper.java

@@ -7,6 +7,7 @@ import com.qmth.teachcloud.report.business.bean.result.TAExamCourseTeacherResult
 import com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult;
 import com.qmth.teachcloud.report.business.bean.result.TeacherMyClassRankResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
+import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,5 +38,5 @@ public interface TAExamCourseCollegeTeacherMapper extends BaseMapper<TAExamCours
      */
     List<TAExamCourseTeacherResult> findTeacherInfo(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("collegeId") Long collegeId);
 
-    IPage<TeacherClassRankResult> listTeacherClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
+    IPage<TeacherClassRankResult> listTeacherClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("column") String column, @Param("order") String order);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TBExamStudentMapper.java

@@ -73,9 +73,10 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
      * @param inspectCollegeId
      * @param teacherId
      * @param studentParam
+     * @param collegeIds
      * @return
      */
-    IPage<TeachCollegeResult> listTeachCollegeResult(@Param("page") Page<TeachCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId,@Param("teachCollegeId") Long teachCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam);
+    IPage<TeachCollegeResult> listTeachCollegeResult(@Param("page") Page<TeachCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teachCollegeId") Long teachCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam, @Param("collegeIds") List<Long> collegeIds);
 
     List<TeachCollegeResult> listTeachCollegeResult(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam);
 

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/TAExamCourseCollegeTeacherService.java

@@ -6,6 +6,7 @@ import com.qmth.teachcloud.report.business.bean.result.TAExamCourseTeacherResult
 import com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult;
 import com.qmth.teachcloud.report.business.bean.result.TeacherMyClassRankResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
+import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
 import java.util.List;
@@ -36,5 +37,5 @@ public interface TAExamCourseCollegeTeacherService extends IService<TAExamCourse
      */
     List<TAExamCourseTeacherResult> findTeacherInfo(Long examId, String courseCode, Long collegeId);
 
-    IPage<TeacherClassRankResult> listTeacherClassRank(SemesterEnum semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize);
+    IPage<TeacherClassRankResult> listTeacherClassRank(SemesterEnum semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TAExamCourseCollegeTeacherServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.teachcloud.report.business.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -10,6 +11,7 @@ import com.qmth.teachcloud.report.business.bean.result.TAExamCourseTeacherResult
 import com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult;
 import com.qmth.teachcloud.report.business.bean.result.TeacherMyClassRankResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
+import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseCollegeTeacherMapper;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeTeacherService;
@@ -86,10 +88,9 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
     }
 
     @Override
-    public IPage<TeacherClassRankResult> listTeacherClassRank(SemesterEnum semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize) {
+    public IPage<TeacherClassRankResult> listTeacherClassRank(SemesterEnum semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<TeacherClassRankResult> page = new Page<>(pageNumber, pageSize);
-        IPage<TeacherClassRankResult> listPage = taExamCourseCollegeTeacherMapper.listTeacherClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode);
-        return listPage;
+        return taExamCourseCollegeTeacherMapper.listTeacherClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, SystemConstant.getOrderColumn(column), Objects.nonNull(order) ? order.name() : null);
     }
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamStudentServiceImpl.java

@@ -12,6 +12,7 @@ import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.BasicCourseService;
+import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.ExcelUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.common.util.excel.ExcelError;
@@ -77,6 +78,9 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     @Resource
     TBModuleProficiencyMapper tbModuleProficiencyMapper;
 
+    @Resource
+    SysOrgService sysOrgService;
+
     /**
      * 查询开课学院列表
      *
@@ -136,8 +140,12 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         Long orgId = sysUser.getOrgId();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<TeachCollegeResult> page = new Page<>(pageNumber, pageSize);
-        IPage<TeachCollegeResult> listPage = tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId,orgId, teacherId, studentParam);
-        return listPage;
+        List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
+        if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
+            return tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, collegeIds);
+        } else {
+            return tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, Arrays.asList(sysUser.getOrgId()));
+        }
     }
 
     @Override

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/calculate/AsyncCalculateTaskTemplete.java

@@ -19,6 +19,6 @@ public abstract class AsyncCalculateTaskTemplete {
      * @return
      * @throws IOException
      */
-    @Async
+    @Async("taskThreadPool")
     public abstract Result calculateTask(Map<String, Object> map) throws IOException, Exception;
 }

teachcloud-report-business/src/main/resources/mapper/TAExamCourseCollegeTeacherMapper.xml

@@ -182,6 +182,8 @@
                 and a.course_code = #{courseCode}
             </if>
         </where>
-        order by a.inspect_college_name
+        <if test="column != null and column != '' and order != null and order != ''">
+            order by a.${column} ${order}
+        </if>
     </select>
 </mapper>

teachcloud-report-business/src/main/resources/mapper/TBExamStudentMapper.xml

@@ -73,6 +73,7 @@
             <include refid="conditionSql"/>
         </where>
     </select>
+
     <select id="listTeachCollegeResult"
             resultType="com.qmth.teachcloud.report.business.bean.result.TeachCollegeResult">
         SELECT
@@ -135,6 +136,12 @@
                 or a.student_code like concat('%' ,#{studentParam}, '%')
                 or a.name like concat('%' ,#{studentParam}, '%'))
             </if>
+            <if test="collegeIds != null and collegeIds != ''">
+                and a.teach_college_id in
+                <foreach collection="collegeIds" item="collegeId" index="index" open="(" separator="," close=")">
+                    #{collegeId}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="listInspectCollegeResult"

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);

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

@@ -7,6 +7,7 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacher;
 import com.qmth.teachcloud.report.business.entity.TAExamTotal;
+import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeTeacherService;
 import com.qmth.teachcloud.report.business.service.TAExamCourseService;
@@ -87,8 +88,10 @@ public class DataDriveController {
                                        @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                        @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
                                        @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
-                                       @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize) {
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.listTeacherClassRank(semester, examId, courseCode, pageNumber, pageSize));
+                                       @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+                                       @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
+                                       @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.listTeacherClassRank(semester, examId, courseCode, pageNumber, pageSize, column, order));
     }
 
     @ApiOperation(value = "全校课程考试分析-考试概况-导出课程分析报表")