格式化问题

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ReportSubjectClassDTO.java

@@ -79,15 +79,15 @@ public class ReportSubjectClassDTO {
     private Integer realityCount;
 
     public ReportSubjectClassDTO(ReportSubjectClass r) {
-        DecimalFormat format = new DecimalFormat("####.##");
+        DecimalFormat format = new DecimalFormat("0.00");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.className = r.getClassName();
-        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.excellentRate =format.format( new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).toString());
+        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.excellentRate =format.format( new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
         this.passCount = r.getPassCount();
         this.excellentCount = r.getExcellentCount();
         this.realityCount = r.getRealityCount();

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ReportSubjectCollegeDTO.java

@@ -86,15 +86,15 @@ public class ReportSubjectCollegeDTO {
     private Integer realityCount;
 
     public ReportSubjectCollegeDTO(ReportSubjectCollege r) {
-        DecimalFormat format = new DecimalFormat("####.##");
+        DecimalFormat format = new DecimalFormat("0.00");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.collegeName = r.getCollegeName();
-        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.excellentRate = format.format(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).toString());
+        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.excellentRate = format.format(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
         this.passCount = r.getPassCount();
         this.excellentCount = r.getExcellentCount();
         this.realityCount = r.getRealityCount();

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ReportSubjectDTO.java

@@ -92,14 +92,14 @@ public class ReportSubjectDTO {
     private Integer realityCount;
 
     public ReportSubjectDTO(ReportSubject r) {
-        DecimalFormat format = new DecimalFormat("####.##");
+        DecimalFormat format = new DecimalFormat("0.00");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
-        this.maxScore =format.format( new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.excellentRate = format.format(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).toString());
+        this.maxScore =format.format( new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.excellentRate = format.format(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
         this.passCount = r.getPassCount();
         this.excellentCount = r.getExcellentCount();
         this.realityCount = r.getRealityCount();

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ReportSubjectGroupDTO.java

@@ -91,18 +91,18 @@ public class ReportSubjectGroupDTO {
     private Integer fullCount;
 
     public ReportSubjectGroupDTO(ReportSubjectGroup r) {
-        DecimalFormat format = new DecimalFormat("####.##");
+        DecimalFormat format = new DecimalFormat("0.00");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.groupName = r.getGroupName();
         this.groupNumber = r.getGroupNumber();
-        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.totalScore = format.format(new BigDecimal(r.getTotalScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.scoreRate = format.format(new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.stdev = format.format(new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.coefficient = format.format(new BigDecimal(r.getCoefficient()).setScale(2, RoundingMode.HALF_UP).toString());
+        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.totalScore = format.format(new BigDecimal(r.getTotalScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.scoreRate = format.format(new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.stdev = format.format(new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.coefficient = format.format(new BigDecimal(r.getCoefficient()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
         this.zeroCount = r.getZeroCount();
         this.fullCount = r.getFullCount();
     }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ReportSubjectQuestionDTO.java

@@ -80,17 +80,17 @@ public class ReportSubjectQuestionDTO {
     private String paperType;
 
     public ReportSubjectQuestionDTO(ReportSubjectQuestion r) {
-        DecimalFormat format = new DecimalFormat("####.##");
+        DecimalFormat format = new DecimalFormat("0.00");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.questionName = r.getQuestionName();
         this.mainNumber = r.getMainNumber();
         this.subNumber = r.getSubNumber();
-        this.totalScore = format.format(new BigDecimal(r.getTotalScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.stdev = format.format(new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.scoreRate = format.format(new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.fullScoreRate = format.format(new BigDecimal(r.getFullScoreRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString());
+        this.totalScore = format.format(new BigDecimal(r.getTotalScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.stdev = format.format(new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.scoreRate = format.format(new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.fullScoreRate = format.format(new BigDecimal(r.getFullScoreRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
         this.paperType = r.getPaperType();
     }
 

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ReportSubjectTeacherClassDTO.java

@@ -92,17 +92,17 @@ public class ReportSubjectTeacherClassDTO {
     private String relativeAvgScore;
 
     public ReportSubjectTeacherClassDTO(ReportSubjectTeacherClass r) {
-        DecimalFormat format = new DecimalFormat("####.##");
+        DecimalFormat format = new DecimalFormat("0.00");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.className = r.getClassName();
         this.teacherName = r.getTeacherName();
-        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.excellentRate = format.format(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.relativeAvgScore = format.format(new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP).toString());
+        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.excellentRate = format.format(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.relativeAvgScore = format.format(new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
         this.passCount = r.getPassCount();
         this.excellentCount = r.getExcellentCount();
         this.realityCount = r.getRealityCount();

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ReportSubjectTeacherDTO.java

@@ -91,16 +91,16 @@ public class ReportSubjectTeacherDTO {
     private Integer realityCount;
 
     public ReportSubjectTeacherDTO(ReportSubjectTeacher r) {
-        DecimalFormat format = new DecimalFormat("####.##");
+        DecimalFormat format = new DecimalFormat("0.00");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.teacherName = r.getTeacherName();
-        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.excellentRate = format.format(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).toString());
-        this.relativeAvgScore = format.format(new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP).toString());
+        this.maxScore = format.format(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.minScore = format.format(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.avgScore = format.format(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.passRate = format.format(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.excellentRate = format.format(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
+        this.relativeAvgScore = format.format(new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue()).toString();
         this.passCount = r.getPassCount();
         this.excellentCount = r.getExcellentCount();
         this.realityCount = r.getRealityCount();