wangliang 4 éve
szülő
commit
3d41adb241
16 módosított fájl, 478 hozzáadás és 89 törlés
  1. 11 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/excel/TAExamCourseDto.java
  2. 23 4
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/query/BasicAnswerDto.java
  3. 18 3
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/query/BasicExamRecordDto.java
  4. 8 1
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/query/ValidAnswerDetailDto.java
  5. 22 4
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/SurveyTeacherExamCourseResult.java
  6. 12 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TAExamCourseCollegeTeacherResult.java
  7. 41 8
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TAExamCourseResult.java
  8. 82 16
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TAExamCourseTeacherResult.java
  9. 12 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TBPaperStructResult.java
  10. 43 8
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TrialCalculationResult.java
  11. 77 15
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/inspectCourseExamTotal/CollegeCourseInfo.java
  12. 17 3
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseClazz.java
  13. 41 8
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseCollegeInspect.java
  14. 12 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseCollegeInspectDio.java
  15. 47 9
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseCollegeTeacher.java
  16. 12 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseDifficult.java

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

@@ -1,6 +1,7 @@
 package com.qmth.teachcloud.report.business.bean.dto.excel;
 
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -157,7 +158,11 @@ public class TAExamCourseDto implements Serializable {
     }
 
     public BigDecimal getAvgScore() {
-        return avgScore;
+        if (Objects.nonNull(avgScore)) {
+            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScore;
+        }
     }
 
     public void setAvgScore(BigDecimal avgScore) {
@@ -181,7 +186,11 @@ public class TAExamCourseDto implements Serializable {
     }
 
     public BigDecimal getPaperCurrentAvgScore() {
-        return paperCurrentAvgScore;
+        if (Objects.nonNull(paperCurrentAvgScore)) {
+            return paperCurrentAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return paperCurrentAvgScore;
+        }
     }
 
     public void setPaperCurrentAvgScore(BigDecimal paperCurrentAvgScore) {

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

@@ -1,6 +1,9 @@
 package com.qmth.teachcloud.report.business.bean.dto.query;
 
+import com.qmth.teachcloud.common.contant.SystemConstant;
+
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description:
@@ -74,7 +77,11 @@ public class BasicAnswerDto {
     }
 
     public BigDecimal getScore() {
-        return score;
+        if (Objects.nonNull(score)) {
+            return score.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return score;
+        }
     }
 
     public void setScore(BigDecimal score) {
@@ -130,7 +137,11 @@ public class BasicAnswerDto {
     }
 
     public BigDecimal getSubjectiveScore() {
-        return subjectiveScore;
+        if (Objects.nonNull(subjectiveScore)) {
+            return subjectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return subjectiveScore;
+        }
     }
 
     public void setSubjectiveScore(BigDecimal subjectiveScore) {
@@ -138,7 +149,11 @@ public class BasicAnswerDto {
     }
 
     public BigDecimal getObjectiveScore() {
-        return objectiveScore;
+        if (Objects.nonNull(objectiveScore)) {
+            return objectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return objectiveScore;
+        }
     }
 
     public void setObjectiveScore(BigDecimal objectiveScore) {
@@ -146,7 +161,11 @@ public class BasicAnswerDto {
     }
 
     public BigDecimal getTotalScore() {
-        return totalScore;
+        if (Objects.nonNull(totalScore)) {
+            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return totalScore;
+        }
     }
 
     public void setTotalScore(BigDecimal totalScore) {

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

@@ -1,6 +1,9 @@
 package com.qmth.teachcloud.report.business.bean.dto.query;
 
+import com.qmth.teachcloud.common.contant.SystemConstant;
+
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: 基础考试记录
@@ -175,7 +178,11 @@ public class BasicExamRecordDto {
     }
 
     public BigDecimal getSubjectiveScore() {
-        return subjectiveScore;
+        if (Objects.nonNull(subjectiveScore)) {
+            return subjectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return subjectiveScore;
+        }
     }
 
     public void setSubjectiveScore(BigDecimal subjectiveScore) {
@@ -183,7 +190,11 @@ public class BasicExamRecordDto {
     }
 
     public BigDecimal getObjectiveScore() {
-        return objectiveScore;
+        if (Objects.nonNull(objectiveScore)) {
+            return objectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return objectiveScore;
+        }
     }
 
     public void setObjectiveScore(BigDecimal objectiveScore) {
@@ -191,7 +202,11 @@ public class BasicExamRecordDto {
     }
 
     public BigDecimal getTotalScore() {
-        return totalScore;
+        if (Objects.nonNull(totalScore)) {
+            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return totalScore;
+        }
     }
 
     public void setTotalScore(BigDecimal totalScore) {

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

@@ -1,6 +1,9 @@
 package com.qmth.teachcloud.report.business.bean.dto.query;
 
+import com.qmth.teachcloud.common.contant.SystemConstant;
+
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description:
@@ -61,7 +64,11 @@ public class ValidAnswerDetailDto {
     }
 
     public BigDecimal getScore() {
-        return score;
+        if (Objects.nonNull(score)) {
+            return score.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return score;
+        }
     }
 
     public void setScore(BigDecimal score) {

+ 22 - 4
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/SurveyTeacherExamCourseResult.java

@@ -1,12 +1,14 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.entity.TBExamCourse;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: SurveyTeacherExamCourseResult
@@ -42,7 +44,11 @@ public class SurveyTeacherExamCourseResult implements Serializable {
     }
 
     public BigDecimal getAvgScore() {
-        return avgScore;
+        if (Objects.nonNull(avgScore)) {
+            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScore;
+        }
     }
 
     public void setAvgScore(BigDecimal avgScore) {
@@ -50,7 +56,11 @@ public class SurveyTeacherExamCourseResult implements Serializable {
     }
 
     public BigDecimal getNotPassRate() {
-        return notPassRate;
+        if (Objects.nonNull(notPassRate)) {
+            return notPassRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return notPassRate;
+        }
     }
 
     public void setNotPassRate(BigDecimal notPassRate) {
@@ -58,7 +68,11 @@ public class SurveyTeacherExamCourseResult implements Serializable {
     }
 
     public BigDecimal getCurrentAvgScore() {
-        return currentAvgScore;
+        if (Objects.nonNull(currentAvgScore)) {
+            return currentAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentAvgScore;
+        }
     }
 
     public void setCurrentAvgScore(BigDecimal currentAvgScore) {
@@ -66,7 +80,11 @@ public class SurveyTeacherExamCourseResult implements Serializable {
     }
 
     public BigDecimal getCurrentNotPassRate() {
-        return currentNotPassRate;
+        if (Objects.nonNull(currentNotPassRate)) {
+            return currentNotPassRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentNotPassRate;
+        }
     }
 
     public void setCurrentNotPassRate(BigDecimal currentNotPassRate) {

+ 12 - 2
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TAExamCourseCollegeTeacherResult.java

@@ -1,11 +1,13 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: TAExamCourseCollegeTeacherResult
@@ -24,7 +26,11 @@ public class TAExamCourseCollegeTeacherResult extends TAExamCourseCollegeTeacher
     private BigDecimal currentAvgScoreAfter;
 
     public BigDecimal getCurrentAvgScoreBefore() {
-        return currentAvgScoreBefore;
+        if (Objects.nonNull(currentAvgScoreBefore)) {
+            return currentAvgScoreBefore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentAvgScoreBefore;
+        }
     }
 
     public void setCurrentAvgScoreBefore(BigDecimal currentAvgScoreBefore) {
@@ -32,7 +38,11 @@ public class TAExamCourseCollegeTeacherResult extends TAExamCourseCollegeTeacher
     }
 
     public BigDecimal getCurrentAvgScoreAfter() {
-        return currentAvgScoreAfter;
+        if (Objects.nonNull(currentAvgScoreAfter)) {
+            return currentAvgScoreAfter.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentAvgScoreAfter;
+        }
     }
 
     public void setCurrentAvgScoreAfter(BigDecimal currentAvgScoreAfter) {

+ 41 - 8
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TAExamCourseResult.java

@@ -1,6 +1,7 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -70,7 +71,11 @@ public class TAExamCourseResult extends TAExamCourse implements Serializable {
     }
 
     public BigDecimal getAvgScoreBefore() {
-        return avgScoreBefore;
+        if (Objects.nonNull(avgScoreBefore)) {
+            return avgScoreBefore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScoreBefore;
+        }
     }
 
     public void setAvgScoreBefore(BigDecimal avgScoreBefore) {
@@ -78,7 +83,11 @@ public class TAExamCourseResult extends TAExamCourse implements Serializable {
     }
 
     public BigDecimal getNotPassRateBefore() {
-        return notPassRateBefore;
+        if (Objects.nonNull(notPassRateBefore)) {
+            return notPassRateBefore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return notPassRateBefore;
+        }
     }
 
     public void setNotPassRateBefore(BigDecimal notPassRateBefore) {
@@ -86,7 +95,11 @@ public class TAExamCourseResult extends TAExamCourse implements Serializable {
     }
 
     public BigDecimal getCurrentAvgScoreBefore() {
-        return currentAvgScoreBefore;
+        if (Objects.nonNull(currentAvgScoreBefore)) {
+            return currentAvgScoreBefore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentAvgScoreBefore;
+        }
     }
 
     public void setCurrentAvgScoreBefore(BigDecimal currentAvgScoreBefore) {
@@ -94,7 +107,11 @@ public class TAExamCourseResult extends TAExamCourse implements Serializable {
     }
 
     public BigDecimal getCurrentNotPassRateBefore() {
-        return currentNotPassRateBefore;
+        if (Objects.nonNull(currentNotPassRateBefore)) {
+            return currentNotPassRateBefore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentNotPassRateBefore;
+        }
     }
 
     public void setCurrentNotPassRateBefore(BigDecimal currentNotPassRateBefore) {
@@ -102,7 +119,11 @@ public class TAExamCourseResult extends TAExamCourse implements Serializable {
     }
 
     public BigDecimal getAvgScoreAfter() {
-        return avgScoreAfter;
+        if (Objects.nonNull(avgScoreAfter)) {
+            return avgScoreAfter.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScoreAfter;
+        }
     }
 
     public void setAvgScoreAfter(BigDecimal avgScoreAfter) {
@@ -110,7 +131,11 @@ public class TAExamCourseResult extends TAExamCourse implements Serializable {
     }
 
     public BigDecimal getNotPassRateAfter() {
-        return notPassRateAfter;
+        if (Objects.nonNull(notPassRateAfter)) {
+            return notPassRateAfter.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return notPassRateAfter;
+        }
     }
 
     public void setNotPassRateAfter(BigDecimal notPassRateAfter) {
@@ -118,7 +143,11 @@ public class TAExamCourseResult extends TAExamCourse implements Serializable {
     }
 
     public BigDecimal getCurrentAvgScoreAfter() {
-        return currentAvgScoreAfter;
+        if (Objects.nonNull(currentAvgScoreAfter)) {
+            return currentAvgScoreAfter.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentAvgScoreAfter;
+        }
     }
 
     public void setCurrentAvgScoreAfter(BigDecimal currentAvgScoreAfter) {
@@ -126,7 +155,11 @@ public class TAExamCourseResult extends TAExamCourse implements Serializable {
     }
 
     public BigDecimal getCurrentNotPassRateAfter() {
-        return currentNotPassRateAfter;
+        if (Objects.nonNull(currentNotPassRateAfter)) {
+            return currentNotPassRateAfter.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentNotPassRateAfter;
+        }
     }
 
     public void setCurrentNotPassRateAfter(BigDecimal currentNotPassRateAfter) {

+ 82 - 16
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TAExamCourseTeacherResult.java

@@ -1,9 +1,11 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: TAExamCourseTeacherResult
@@ -122,7 +124,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getColMinScore() {
-        return colMinScore;
+        if (Objects.nonNull(colMinScore)) {
+            return colMinScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colMinScore;
+        }
     }
 
     public void setColMinScore(BigDecimal colMinScore) {
@@ -130,7 +136,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getColMaxScore() {
-        return colMaxScore;
+        if (Objects.nonNull(colMaxScore)) {
+            return colMaxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colMaxScore;
+        }
     }
 
     public void setColMaxScore(BigDecimal colMaxScore) {
@@ -138,7 +148,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getColAvgScore() {
-        return colAvgScore;
+        if (Objects.nonNull(colAvgScore)) {
+            return colAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colAvgScore;
+        }
     }
 
     public void setColAvgScore(BigDecimal colAvgScore) {
@@ -146,7 +160,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getColUpperQuartile() {
-        return colUpperQuartile;
+        if (Objects.nonNull(colUpperQuartile)) {
+            return colUpperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colUpperQuartile;
+        }
     }
 
     public void setColUpperQuartile(BigDecimal colUpperQuartile) {
@@ -154,7 +172,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getColMedian() {
-        return colMedian;
+        if (Objects.nonNull(colMedian)) {
+            return colMedian.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colMedian;
+        }
     }
 
     public void setColMedian(BigDecimal colMedian) {
@@ -162,7 +184,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getColLowerQuartile() {
-        return colLowerQuartile;
+        if (Objects.nonNull(colLowerQuartile)) {
+            return colLowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colLowerQuartile;
+        }
     }
 
     public void setColLowerQuartile(BigDecimal colLowerQuartile) {
@@ -178,7 +204,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getColStandardDeviation() {
-        return colStandardDeviation;
+        if (Objects.nonNull(colStandardDeviation)) {
+            return colStandardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colStandardDeviation;
+        }
     }
 
     public void setColStandardDeviation(BigDecimal colStandardDeviation) {
@@ -186,7 +216,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getColRelativePosition() {
-        return colRelativePosition;
+        if (Objects.nonNull(colRelativePosition)) {
+            return colRelativePosition.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colRelativePosition;
+        }
     }
 
     public void setColRelativePosition(BigDecimal colRelativePosition) {
@@ -218,7 +252,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getSchMinScore() {
-        return schMinScore;
+        if (Objects.nonNull(schMinScore)) {
+            return schMinScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schMinScore;
+        }
     }
 
     public void setSchMinScore(BigDecimal schMinScore) {
@@ -226,7 +264,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getSchMaxScore() {
-        return schMaxScore;
+        if (Objects.nonNull(schMaxScore)) {
+            return schMaxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schMaxScore;
+        }
     }
 
     public void setSchMaxScore(BigDecimal schMaxScore) {
@@ -234,7 +276,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getSchAvgScore() {
-        return schAvgScore;
+        if (Objects.nonNull(schAvgScore)) {
+            return schAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schAvgScore;
+        }
     }
 
     public void setSchAvgScore(BigDecimal schAvgScore) {
@@ -242,7 +288,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getSchUpperQuartile() {
-        return schUpperQuartile;
+        if (Objects.nonNull(schUpperQuartile)) {
+            return schUpperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schUpperQuartile;
+        }
     }
 
     public void setSchUpperQuartile(BigDecimal schUpperQuartile) {
@@ -250,7 +300,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getSchMedian() {
-        return schMedian;
+        if (Objects.nonNull(schMedian)) {
+            return schMedian.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schMedian;
+        }
     }
 
     public void setSchMedian(BigDecimal schMedian) {
@@ -258,7 +312,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getSchLowerQuartile() {
-        return schLowerQuartile;
+        if (Objects.nonNull(schLowerQuartile)) {
+            return schLowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schLowerQuartile;
+        }
     }
 
     public void setSchLowerQuartile(BigDecimal schLowerQuartile) {
@@ -274,7 +332,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getSchStandardDeviation() {
-        return schStandardDeviation;
+        if (Objects.nonNull(schStandardDeviation)) {
+            return schStandardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schStandardDeviation;
+        }
     }
 
     public void setSchStandardDeviation(BigDecimal schStandardDeviation) {
@@ -282,7 +344,11 @@ public class TAExamCourseTeacherResult implements Serializable {
     }
 
     public BigDecimal getSchRelativePosition() {
-        return schRelativePosition;
+        if (Objects.nonNull(schRelativePosition)) {
+            return schRelativePosition.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schRelativePosition;
+        }
     }
 
     public void setSchRelativePosition(BigDecimal schRelativePosition) {

+ 12 - 2
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TBPaperStructResult.java

@@ -1,11 +1,13 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.report.business.entity.TBPaperStruct;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: 试卷结构result
@@ -60,7 +62,11 @@ public class TBPaperStructResult extends TBPaperStruct implements Serializable {
     }
 
     public BigDecimal getScoreRate() {
-        return scoreRate;
+        if (Objects.nonNull(scoreRate)) {
+            return scoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return scoreRate;
+        }
     }
 
     public void setScoreRate(BigDecimal scoreRate) {
@@ -76,7 +82,11 @@ public class TBPaperStructResult extends TBPaperStruct implements Serializable {
     }
 
     public BigDecimal getValidity() {
-        return validity;
+        if (Objects.nonNull(validity)) {
+            return validity.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return validity;
+        }
     }
 
     public void setValidity(BigDecimal validity) {

+ 43 - 8
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TrialCalculationResult.java

@@ -1,6 +1,9 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
+import com.qmth.teachcloud.common.contant.SystemConstant;
+
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: 试算结果
@@ -44,7 +47,11 @@ public class TrialCalculationResult {
     }
 
     public BigDecimal getAvgScore() {
-        return avgScore;
+        if (Objects.nonNull(avgScore)) {
+            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScore;
+        }
     }
 
     public void setAvgScore(BigDecimal avgScore) {
@@ -52,7 +59,11 @@ public class TrialCalculationResult {
     }
 
     public BigDecimal getFailRate() {
-        return failRate;
+        if (Objects.nonNull(failRate)) {
+            return failRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return failRate;
+        }
     }
 
     public void setFailRate(BigDecimal failRate) {
@@ -68,7 +79,11 @@ public class TrialCalculationResult {
     }
 
     public BigDecimal getCurrentAvgScore() {
-        return currentAvgScore;
+        if (Objects.nonNull(currentAvgScore)) {
+            return currentAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentAvgScore;
+        }
     }
 
     public void setCurrentAvgScore(BigDecimal currentAvgScore) {
@@ -76,7 +91,11 @@ public class TrialCalculationResult {
     }
 
     public BigDecimal getCurrentFailRate() {
-        return currentFailRate;
+        if (Objects.nonNull(currentFailRate)) {
+            return currentFailRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentFailRate;
+        }
     }
 
     public void setCurrentFailRate(BigDecimal currentFailRate) {
@@ -92,7 +111,11 @@ public class TrialCalculationResult {
     }
 
     public BigDecimal getAvgScoreAssign() {
-        return avgScoreAssign;
+        if (Objects.nonNull(avgScoreAssign)) {
+            return avgScoreAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScoreAssign;
+        }
     }
 
     public void setAvgScoreAssign(BigDecimal avgScoreAssign) {
@@ -100,7 +123,11 @@ public class TrialCalculationResult {
     }
 
     public BigDecimal getFailRateAssign() {
-        return failRateAssign;
+        if (Objects.nonNull(failRateAssign)) {
+            return failRateAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return failRateAssign;
+        }
     }
 
     public void setFailRateAssign(BigDecimal failRateAssign) {
@@ -116,7 +143,11 @@ public class TrialCalculationResult {
     }
 
     public BigDecimal getCurrentAvgScoreAssign() {
-        return currentAvgScoreAssign;
+        if (Objects.nonNull(currentAvgScoreAssign)) {
+            return currentAvgScoreAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentAvgScoreAssign;
+        }
     }
 
     public void setCurrentAvgScoreAssign(BigDecimal currentAvgScoreAssign) {
@@ -124,7 +155,11 @@ public class TrialCalculationResult {
     }
 
     public BigDecimal getCurrentFailRateAssign() {
-        return currentFailRateAssign;
+        if (Objects.nonNull(currentFailRateAssign)) {
+            return currentFailRateAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return currentFailRateAssign;
+        }
     }
 
     public void setCurrentFailRateAssign(BigDecimal currentFailRateAssign) {

+ 77 - 15
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/inspectCourseExamTotal/CollegeCourseInfo.java

@@ -1,9 +1,11 @@
 package com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal;
 
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: 考查学院-课程数据
@@ -69,7 +71,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getColLowerQuartile() {
-        return colLowerQuartile;
+        if (Objects.nonNull(colLowerQuartile)) {
+            return colLowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colLowerQuartile;
+        }
     }
 
     public void setColLowerQuartile(BigDecimal colLowerQuartile) {
@@ -77,7 +83,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getColStandardDeviation() {
-        return colStandardDeviation;
+        if (Objects.nonNull(colStandardDeviation)) {
+            return colStandardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colStandardDeviation;
+        }
     }
 
     public void setColStandardDeviation(BigDecimal colStandardDeviation) {
@@ -93,7 +103,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getColMinScore() {
-        return colMinScore;
+        if (Objects.nonNull(colMinScore)) {
+            return colMinScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colMinScore;
+        }
     }
 
     public void setColMinScore(BigDecimal colMinScore) {
@@ -101,7 +115,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getSchAvgScore() {
-        return schAvgScore;
+        if (Objects.nonNull(schAvgScore)) {
+            return schAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schAvgScore;
+        }
     }
 
     public void setSchAvgScore(BigDecimal schAvgScore) {
@@ -109,7 +127,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getSchLowerQuartile() {
-        return schLowerQuartile;
+        if (Objects.nonNull(schLowerQuartile)) {
+            return schLowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schLowerQuartile;
+        }
     }
 
     public void setSchLowerQuartile(BigDecimal schLowerQuartile) {
@@ -117,7 +139,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getColMaxScore() {
-        return colMaxScore;
+        if (Objects.nonNull(colMaxScore)) {
+            return colMaxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colMaxScore;
+        }
     }
 
     public void setColMaxScore(BigDecimal colMaxScore) {
@@ -133,7 +159,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getSchMaxScore() {
-        return schMaxScore;
+        if (Objects.nonNull(schMaxScore)) {
+            return schMaxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schMaxScore;
+        }
     }
 
     public void setSchMaxScore(BigDecimal schMaxScore) {
@@ -141,7 +171,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getColRealityCount() {
-        return colRealityCount;
+        if (Objects.nonNull(colRealityCount)) {
+            return colRealityCount.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colRealityCount;
+        }
     }
 
     public void setColRealityCount(BigDecimal colRealityCount) {
@@ -149,7 +183,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getSchStandardDeviation() {
-        return schStandardDeviation;
+        if (Objects.nonNull(schStandardDeviation)) {
+            return schStandardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schStandardDeviation;
+        }
     }
 
     public void setSchStandardDeviation(BigDecimal schStandardDeviation) {
@@ -165,7 +203,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getSchMinScore() {
-        return schMinScore;
+        if (Objects.nonNull(schMinScore)) {
+            return schMinScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schMinScore;
+        }
     }
 
     public void setSchMinScore(BigDecimal schMinScore) {
@@ -173,7 +215,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getColAvgScore() {
-        return colAvgScore;
+        if (Objects.nonNull(colAvgScore)) {
+            return colAvgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colAvgScore;
+        }
     }
 
     public void setColAvgScore(BigDecimal colAvgScore) {
@@ -181,7 +227,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getColUpperQuartile() {
-        return colUpperQuartile;
+        if (Objects.nonNull(colUpperQuartile)) {
+            return colUpperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colUpperQuartile;
+        }
     }
 
     public void setColUpperQuartile(BigDecimal colUpperQuartile) {
@@ -189,7 +239,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getColMedian() {
-        return colMedian;
+        if (Objects.nonNull(colMedian)) {
+            return colMedian.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colMedian;
+        }
     }
 
     public void setColMedian(BigDecimal colMedian) {
@@ -197,7 +251,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getColRelativePosition() {
-        return colRelativePosition;
+        if (Objects.nonNull(colRelativePosition)) {
+            return colRelativePosition.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colRelativePosition;
+        }
     }
 
     public void setColRelativePosition(BigDecimal colRelativePosition) {
@@ -205,7 +263,11 @@ public class CollegeCourseInfo implements Serializable {
     }
 
     public BigDecimal getSchUpperQuartile() {
-        return schUpperQuartile;
+        if (Objects.nonNull(schUpperQuartile)) {
+            return schUpperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schUpperQuartile;
+        }
     }
 
     public void setSchUpperQuartile(BigDecimal schUpperQuartile) {

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

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * <p>
@@ -132,7 +134,11 @@ public class TAExamCourseClazz implements Serializable {
     }
 
     public BigDecimal getMaxScore() {
-        return maxScore;
+        if (Objects.nonNull(maxScore)) {
+            return maxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return maxScore;
+        }
     }
 
     public void setMaxScore(BigDecimal maxScore) {
@@ -140,7 +146,11 @@ public class TAExamCourseClazz implements Serializable {
     }
 
     public BigDecimal getMinScore() {
-        return minScore;
+        if (Objects.nonNull(minScore)) {
+            return minScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return minScore;
+        }
     }
 
     public void setMinScore(BigDecimal minScore) {
@@ -148,7 +158,11 @@ public class TAExamCourseClazz implements Serializable {
     }
 
     public BigDecimal getAvgScore() {
-        return avgScore;
+        if (Objects.nonNull(avgScore)) {
+            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScore;
+        }
     }
 
     public void setAvgScore(BigDecimal avgScore) {

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -153,7 +154,11 @@ public class TAExamCourseCollegeInspect implements Serializable {
     }
 
     public BigDecimal getMaxScore() {
-        return maxScore;
+        if (Objects.nonNull(maxScore)) {
+            return maxScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return maxScore;
+        }
     }
 
     public void setMaxScore(BigDecimal maxScore) {
@@ -161,7 +166,11 @@ public class TAExamCourseCollegeInspect implements Serializable {
     }
 
     public BigDecimal getMinScore() {
-        return minScore;
+        if (Objects.nonNull(minScore)) {
+            return minScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return minScore;
+        }
     }
 
     public void setMinScore(BigDecimal minScore) {
@@ -169,7 +178,11 @@ public class TAExamCourseCollegeInspect implements Serializable {
     }
 
     public BigDecimal getAvgScore() {
-        return avgScore;
+        if (Objects.nonNull(avgScore)) {
+            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScore;
+        }
     }
 
     public void setAvgScore(BigDecimal avgScore) {
@@ -201,7 +214,11 @@ public class TAExamCourseCollegeInspect implements Serializable {
     }
 
     public BigDecimal getUpperQuartile() {
-        return upperQuartile;
+        if (Objects.nonNull(upperQuartile)) {
+            return upperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return upperQuartile;
+        }
     }
 
     public void setUpperQuartile(BigDecimal upperQuartile) {
@@ -209,7 +226,11 @@ public class TAExamCourseCollegeInspect implements Serializable {
     }
 
     public BigDecimal getMedian() {
-        return median;
+        if (Objects.nonNull(median)) {
+            return median.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return median;
+        }
     }
 
     public void setMedian(BigDecimal median) {
@@ -217,7 +238,11 @@ public class TAExamCourseCollegeInspect implements Serializable {
     }
 
     public BigDecimal getLowerQuartile() {
-        return lowerQuartile;
+        if (Objects.nonNull(lowerQuartile)) {
+            return lowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return lowerQuartile;
+        }
     }
 
     public void setLowerQuartile(BigDecimal lowerQuartile) {
@@ -237,7 +262,11 @@ public class TAExamCourseCollegeInspect implements Serializable {
     }
 
     public BigDecimal getStandardDeviation() {
-        return standardDeviation;
+        if (Objects.nonNull(standardDeviation)) {
+            return standardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return standardDeviation;
+        }
     }
 
     public void setStandardDeviation(BigDecimal standardDeviation) {
@@ -245,7 +274,11 @@ public class TAExamCourseCollegeInspect implements Serializable {
     }
 
     public BigDecimal getRelativePosition() {
-        return relativePosition;
+        if (Objects.nonNull(relativePosition)) {
+            return relativePosition.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return relativePosition;
+        }
     }
 
     public void setRelativePosition(BigDecimal relativePosition) {

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

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * <p>
@@ -148,7 +150,11 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
     }
 
     public BigDecimal getAvgScore() {
-        return avgScore;
+        if (Objects.nonNull(avgScore)) {
+            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScore;
+        }
     }
 
     public void setAvgScore(BigDecimal avgScore) {
@@ -156,7 +162,11 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
     }
 
     public BigDecimal getScoreRate() {
-        return scoreRate;
+        if (Objects.nonNull(scoreRate)) {
+            return scoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return scoreRate;
+        }
     }
 
     public void setScoreRate(BigDecimal scoreRate) {

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

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * <p>
@@ -186,7 +188,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     }
 
     public BigDecimal getMinScoreAssign() {
-        return minScoreAssign;
+        if (Objects.nonNull(minScoreAssign)) {
+            return minScoreAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return minScoreAssign;
+        }
     }
 
     public void setMinScoreAssign(BigDecimal minScoreAssign) {
@@ -194,7 +200,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     }
 
     public BigDecimal getMaxScoreAssign() {
-        return maxScoreAssign;
+        if (Objects.nonNull(maxScoreAssign)) {
+            return maxScoreAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return maxScoreAssign;
+        }
     }
 
     public void setMaxScoreAssign(BigDecimal maxScoreAssign) {
@@ -202,7 +212,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     }
 
     public BigDecimal getAvgScoreAssign() {
-        return avgScoreAssign;
+        if (Objects.nonNull(avgScoreAssign)) {
+            return avgScoreAssign.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScoreAssign;
+        }
     }
 
     public void setAvgScoreAssign(BigDecimal avgScoreAssign) {
@@ -210,7 +224,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     }
 
     public BigDecimal getAvgScore() {
-        return avgScore;
+        if (Objects.nonNull(avgScore)) {
+            return avgScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return avgScore;
+        }
     }
 
     public void setAvgScore(BigDecimal avgScore) {
@@ -218,7 +236,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     }
 
     public BigDecimal getUpperQuartile() {
-        return upperQuartile;
+        if (Objects.nonNull(upperQuartile)) {
+            return upperQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return upperQuartile;
+        }
     }
 
     public void setUpperQuartile(BigDecimal upperQuartile) {
@@ -226,7 +248,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     }
 
     public BigDecimal getMedian() {
-        return median;
+        if (Objects.nonNull(median)) {
+            return median.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return median;
+        }
     }
 
     public void setMedian(BigDecimal median) {
@@ -234,7 +260,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     }
 
     public BigDecimal getLowerQuartile() {
-        return lowerQuartile;
+        if (Objects.nonNull(lowerQuartile)) {
+            return lowerQuartile.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return lowerQuartile;
+        }
     }
 
     public void setLowerQuartile(BigDecimal lowerQuartile) {
@@ -250,7 +280,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     }
 
     public BigDecimal getStandardDeviation() {
-        return standardDeviation;
+        if (Objects.nonNull(standardDeviation)) {
+            return standardDeviation.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return standardDeviation;
+        }
     }
 
     public void setStandardDeviation(BigDecimal standardDeviation) {
@@ -258,7 +292,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     }
 
     public BigDecimal getRelativePosition() {
-        return relativePosition;
+        if (Objects.nonNull(relativePosition)) {
+            return relativePosition.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return relativePosition;
+        }
     }
 
     public void setRelativePosition(BigDecimal relativePosition) {

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

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * <p>
@@ -173,7 +175,11 @@ public class TAExamCourseDifficult implements Serializable {
     }
 
     public BigDecimal getSchAvgScoreRate() {
-        return schAvgScoreRate;
+        if (Objects.nonNull(schAvgScoreRate)) {
+            return schAvgScoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return schAvgScoreRate;
+        }
     }
 
     public void setSchAvgScoreRate(BigDecimal schAvgScoreRate) {
@@ -181,7 +187,11 @@ public class TAExamCourseDifficult implements Serializable {
     }
 
     public BigDecimal getColAvgScoreRate() {
-        return colAvgScoreRate;
+        if (Objects.nonNull(colAvgScoreRate)) {
+            return colAvgScoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return colAvgScoreRate;
+        }
     }
 
     public void setColAvgScoreRate(BigDecimal colAvgScoreRate) {