Browse Source

日常更新

wangliang 4 năm trước cách đây
mục cha
commit
568af9d597
14 tập tin đã thay đổi với 223 bổ sung39 xóa
  1. 17 3
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseDio.java
  2. 22 4
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecord.java
  3. 12 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecordDio.java
  4. 17 3
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecordMod.java
  5. 42 8
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseTeacher.java
  6. 12 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseTeacherDifficult.java
  7. 12 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseTeacherDio.java
  8. 17 3
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAPaperStruct.java
  9. 7 1
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBAnswer.java
  10. 12 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBCommonLevelConfig.java
  11. 12 2
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBCommonRankLevelConfig.java
  12. 17 3
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBExamRecord.java
  13. 17 3
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBPaper.java
  14. 7 1
      teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBPaperStruct.java

+ 17 - 3
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseDio.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>
@@ -140,7 +142,11 @@ public class TAExamCourseDio 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) {
@@ -148,7 +154,11 @@ public class TAExamCourseDio implements Serializable {
     }
 
     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) {
@@ -156,7 +166,11 @@ public class TAExamCourseDio implements Serializable {
     }
 
     public BigDecimal getTotalCount() {
-        return totalCount;
+        if (Objects.nonNull(totalCount)) {
+            return totalCount.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return totalCount;
+        }
     }
 
     public void setTotalCount(BigDecimal totalCount) {

+ 22 - 4
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecord.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>
@@ -143,7 +145,11 @@ public class TAExamCourseRecord implements Serializable {
     }
 
     public BigDecimal getAssignedScore() {
-        return assignedScore;
+        if (Objects.nonNull(assignedScore)) {
+            return assignedScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return assignedScore;
+        }
     }
 
     public void setAssignedScore(BigDecimal assignedScore) {
@@ -183,7 +189,11 @@ public class TAExamCourseRecord implements Serializable {
     }
 
     public BigDecimal getOverCollegeRate() {
-        return overCollegeRate;
+        if (Objects.nonNull(overCollegeRate)) {
+            return overCollegeRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return overCollegeRate;
+        }
     }
 
     public void setOverCollegeRate(BigDecimal overCollegeRate) {
@@ -191,7 +201,11 @@ public class TAExamCourseRecord implements Serializable {
     }
 
     public BigDecimal getStandardizedCoefficients() {
-        return standardizedCoefficients;
+        if (Objects.nonNull(standardizedCoefficients)) {
+            return standardizedCoefficients.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return standardizedCoefficients;
+        }
     }
 
     public void setStandardizedCoefficients(BigDecimal standardizedCoefficients) {
@@ -287,7 +301,11 @@ public class TAExamCourseRecord implements Serializable {
     }
 
     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) {

+ 12 - 2
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecordDio.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 TAExamCourseRecordDio implements Serializable {
     }
 
     public BigDecimal getStudentScore() {
-        return studentScore;
+        if (Objects.nonNull(studentScore)) {
+            return studentScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return studentScore;
+        }
     }
 
     public void setStudentScore(BigDecimal studentScore) {
@@ -156,7 +162,11 @@ public class TAExamCourseRecordDio 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) {

+ 17 - 3
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecordMod.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>
@@ -143,7 +145,11 @@ public class TAExamCourseRecordMod implements Serializable {
     }
 
     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) {
@@ -151,7 +157,11 @@ public class TAExamCourseRecordMod 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) {
@@ -159,7 +169,11 @@ public class TAExamCourseRecordMod implements Serializable {
     }
 
     public BigDecimal getFullScore() {
-        return fullScore;
+        if (Objects.nonNull(fullScore)) {
+            return fullScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return fullScore;
+        }
     }
 
     public void setFullScore(BigDecimal fullScore) {

+ 42 - 8
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseTeacher.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>
@@ -164,7 +166,11 @@ public class TAExamCourseTeacher 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) {
@@ -172,7 +178,11 @@ public class TAExamCourseTeacher 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) {
@@ -180,7 +190,11 @@ public class TAExamCourseTeacher 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) {
@@ -188,7 +202,11 @@ public class TAExamCourseTeacher 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) {
@@ -196,7 +214,11 @@ public class TAExamCourseTeacher 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) {
@@ -204,7 +226,11 @@ public class TAExamCourseTeacher 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) {
@@ -220,7 +246,11 @@ public class TAExamCourseTeacher 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) {
@@ -228,7 +258,11 @@ public class TAExamCourseTeacher 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/TAExamCourseTeacherDifficult.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>
@@ -169,7 +171,11 @@ public class TAExamCourseTeacherDifficult 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) {
@@ -177,7 +183,11 @@ public class TAExamCourseTeacherDifficult implements Serializable {
     }
 
     public BigDecimal getTeaAvgScoreRate() {
-        return teaAvgScoreRate;
+        if (Objects.nonNull(teaAvgScoreRate)) {
+            return teaAvgScoreRate.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return teaAvgScoreRate;
+        }
     }
 
     public void setTeaAvgScoreRate(BigDecimal teaAvgScoreRate) {

+ 12 - 2
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseTeacherDio.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 TAExamCourseTeacherDio 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 TAExamCourseTeacherDio 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) {

+ 17 - 3
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAPaperStruct.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>
@@ -213,7 +215,11 @@ public class TAPaperStruct implements Serializable {
     }
 
     public BigDecimal getFullScore() {
-        return fullScore;
+        if (Objects.nonNull(fullScore)) {
+            return fullScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return fullScore;
+        }
     }
 
     public void setFullScore(BigDecimal fullScore) {
@@ -261,7 +267,11 @@ public class TAPaperStruct 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) {
@@ -277,7 +287,11 @@ public class TAPaperStruct 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) {

+ 7 - 1
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBAnswer.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>
@@ -114,7 +116,11 @@ public class TBAnswer implements Serializable {
     }
 
     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) {

+ 12 - 2
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBCommonLevelConfig.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>
@@ -149,7 +151,11 @@ public class TBCommonLevelConfig implements Serializable {
     }
 
     public BigDecimal getMin() {
-        return min;
+        if (Objects.nonNull(min)) {
+            return min.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return min;
+        }
     }
 
     public void setMin(BigDecimal min) {
@@ -157,7 +163,11 @@ public class TBCommonLevelConfig implements Serializable {
     }
 
     public BigDecimal getMax() {
-        return max;
+        if (Objects.nonNull(max)) {
+            return max.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return max;
+        }
     }
 
     public void setMax(BigDecimal max) {

+ 12 - 2
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBCommonRankLevelConfig.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>
@@ -121,7 +123,11 @@ public class TBCommonRankLevelConfig implements Serializable {
     }
 
     public BigDecimal getMin() {
-        return min;
+        if (Objects.nonNull(min)) {
+            return min.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return min;
+        }
     }
 
     public void setMin(BigDecimal min) {
@@ -129,7 +135,11 @@ public class TBCommonRankLevelConfig implements Serializable {
     }
 
     public BigDecimal getMax() {
-        return max;
+        if (Objects.nonNull(max)) {
+            return max.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return max;
+        }
     }
 
     public void setMax(BigDecimal max) {

+ 17 - 3
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBExamRecord.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>
@@ -104,7 +106,11 @@ public class TBExamRecord implements Serializable {
     }
 
     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) {
@@ -112,7 +118,11 @@ public class TBExamRecord implements Serializable {
     }
 
     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) {
@@ -120,7 +130,11 @@ public class TBExamRecord implements Serializable {
     }
 
     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) {

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

@@ -4,12 +4,14 @@ 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 com.qmth.teachcloud.report.business.enums.AssignEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * <p>
@@ -131,7 +133,11 @@ public class TBPaper implements Serializable {
     }
 
     public BigDecimal getCoefficient() {
-        return coefficient;
+        if (Objects.nonNull(coefficient)) {
+            return coefficient.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return coefficient;
+        }
     }
 
     public void setCoefficient(BigDecimal coefficient) {
@@ -139,7 +145,11 @@ public class TBPaper implements Serializable {
     }
 
     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) {
@@ -147,7 +157,11 @@ public class TBPaper implements Serializable {
     }
 
     public BigDecimal getPassScore() {
-        return passScore;
+        if (Objects.nonNull(passScore)) {
+            return passScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return passScore;
+        }
     }
 
     public void setPassScore(BigDecimal passScore) {

+ 7 - 1
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TBPaperStruct.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>
@@ -138,7 +140,11 @@ public class TBPaperStruct implements Serializable {
     }
 
     public BigDecimal getFullScore() {
-        return fullScore;
+        if (Objects.nonNull(fullScore)) {
+            return fullScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return fullScore;
+        }
     }
 
     public void setFullScore(BigDecimal fullScore) {