bug修复

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TeachCollegeResult.java

@@ -1,6 +1,10 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+
+import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Date: 2021/6/8.
@@ -25,13 +29,13 @@ public class TeachCollegeResult {
     @ExcelProperty(name = "考试类型", width = 30, index = 8)
     private String currentStr;
     @ExcelProperty(name = "客观总分", width = 30, index = 9)
-    private String objectiveScore;
+    private BigDecimal objectiveScore;
     @ExcelProperty(name = "主观总分", width = 30, index = 10)
-    private String subjectiveScore;
+    private BigDecimal subjectiveScore;
     @ExcelProperty(name = "卷面总分", width = 30, index = 11)
-    private Integer totalScore;
+    private BigDecimal totalScore;
     @ExcelProperty(name = "赋分总分", width = 30, index = 12)
-    private Integer assignedScore;
+    private BigDecimal assignedScore;
     private String clazzCode;
     @ExcelProperty(name = "班级", width = 30, index = 13)
     private String clazzName;
@@ -106,35 +110,51 @@ public class TeachCollegeResult {
         this.current = current;
     }
 
-    public String getObjectiveScore() {
-        return objectiveScore;
+    public BigDecimal getObjectiveScore() {
+        if (Objects.nonNull(objectiveScore)) {
+            return objectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return objectiveScore;
+        }
     }
 
-    public void setObjectiveScore(String objectiveScore) {
+    public void setObjectiveScore(BigDecimal objectiveScore) {
         this.objectiveScore = objectiveScore;
     }
 
-    public String getSubjectiveScore() {
-        return subjectiveScore;
+    public BigDecimal getSubjectiveScore() {
+        if (Objects.nonNull(subjectiveScore)) {
+            return subjectiveScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return subjectiveScore;
+        }
     }
 
-    public void setSubjectiveScore(String subjectiveScore) {
+    public void setSubjectiveScore(BigDecimal subjectiveScore) {
         this.subjectiveScore = subjectiveScore;
     }
 
-    public Integer getTotalScore() {
-        return totalScore;
+    public BigDecimal getTotalScore() {
+        if (Objects.nonNull(totalScore)) {
+            return totalScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return totalScore;
+        }
     }
 
-    public void setTotalScore(Integer totalScore) {
+    public void setTotalScore(BigDecimal totalScore) {
         this.totalScore = totalScore;
     }
 
-    public Integer getAssignedScore() {
-        return assignedScore;
+    public BigDecimal getAssignedScore() {
+        if (Objects.nonNull(assignedScore)) {
+            return assignedScore.setScale(SystemConstant.FINAL_SCALE, BigDecimal.ROUND_HALF_UP);
+        } else {
+            return assignedScore;
+        }
     }
 
-    public void setAssignedScore(Integer assignedScore) {
+    public void setAssignedScore(BigDecimal assignedScore) {
         this.assignedScore = assignedScore;
     }