更新小数点格式化

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

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.admin.dto;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectClass;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
@@ -78,14 +79,15 @@ public class ReportSubjectClassDTO {
     private Integer realityCount;
 
     public ReportSubjectClassDTO(ReportSubjectClass r) {
+        DecimalFormat format = new DecimalFormat("####.###");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.className = r.getClassName();
-        this.maxScore = new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.minScore = new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.avgScore = new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.passRate = new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.excellentRate = new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).toString();
+        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.passCount = r.getPassCount();
         this.excellentCount = r.getExcellentCount();
         this.realityCount = r.getRealityCount();

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

@@ -0,0 +1,103 @@
+package cn.com.qmth.stmms.admin.dto;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+
+import cn.com.qmth.stmms.biz.report.model.ReportSubjectCollege;
+import cn.com.qmth.stmms.common.annotation.ExcelField;
+
+/**
+ * 课程电厂分析
+ *
+ */
+public class ReportSubjectCollegeDTO {
+
+    /**
+     * 课程编号
+     */
+    @ExcelField(title = "课程代码", align = 2, sort = 10)
+    private String subjectCode;
+
+    /**
+     * 课程名称
+     */
+    @ExcelField(title = "课程名称", align = 2, sort = 20)
+    private String subjectName;
+
+    /**
+     * 电厂名称
+     */
+    @ExcelField(title = "电厂", align = 2, sort = 30)
+    private String collegeName;
+
+    /**
+     * 最高分
+     */
+    @ExcelField(title = "最高分", align = 2, sort = 40)
+    private String maxScore;
+
+    /**
+     * 最低分
+     */
+    @ExcelField(title = "最低分", align = 2, sort = 50)
+    private String minScore;
+
+    /**
+     * 平均分
+     */
+    @ExcelField(title = "平均分", align = 2, sort = 60)
+    private String avgScore;
+
+    /**
+     * 及格率
+     */
+    @ExcelField(title = "及格率", align = 2, sort = 70)
+    private String passRate;
+
+    /**
+     * 及格数
+     */
+    @ExcelField(title = "及格人数", align = 2, sort = 80)
+    private Integer passCount;
+
+    /**
+     * 优秀率
+     */
+    @ExcelField(title = "优秀率", align = 2, sort = 90)
+    private String excellentRate;
+
+    /**
+     * 优秀人数
+     */
+    @ExcelField(title = "优秀人数", align = 2, sort = 100)
+    private Integer excellentCount;
+
+    /**
+     * 报考人数
+     */
+    @ExcelField(title = "报考人数", align = 2, sort = 110)
+    private Integer totalCount;
+
+    /**
+     * 有效人数
+     */
+    @ExcelField(title = "有效人数", align = 2, sort = 120)
+    private Integer realityCount;
+
+    public ReportSubjectCollegeDTO(ReportSubjectCollege r) {
+        DecimalFormat format = new DecimalFormat("####.###");
+        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.passCount = r.getPassCount();
+        this.excellentCount = r.getExcellentCount();
+        this.realityCount = r.getRealityCount();
+        this.totalCount = r.getTotalCount();
+    }
+}

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

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.admin.dto;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 
 import cn.com.qmth.stmms.biz.report.model.ReportSubject;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
@@ -91,13 +92,14 @@ public class ReportSubjectDTO {
     private Integer realityCount;
 
     public ReportSubjectDTO(ReportSubject r) {
+        DecimalFormat format = new DecimalFormat("####.###");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
-        this.maxScore = new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.minScore = new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.avgScore = new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.passRate = new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.excellentRate = new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).toString();
+        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.passCount = r.getPassCount();
         this.excellentCount = r.getExcellentCount();
         this.realityCount = r.getRealityCount();

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

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.admin.dto;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectGroup;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
@@ -90,17 +91,18 @@ public class ReportSubjectGroupDTO {
     private Integer fullCount;
 
     public ReportSubjectGroupDTO(ReportSubjectGroup r) {
+        DecimalFormat format = new DecimalFormat("####.###");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.groupName = r.getGroupName();
         this.groupNumber = r.getGroupNumber();
-        this.maxScore = new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.minScore = new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.avgScore = new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.totalScore = new BigDecimal(r.getTotalScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.scoreRate = new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.stdev = new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.coefficient = new BigDecimal(r.getCoefficient()).setScale(2, RoundingMode.HALF_UP).toString();
+        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.zeroCount = r.getZeroCount();
         this.fullCount = r.getFullCount();
     }

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

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.admin.dto;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectQuestion;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
@@ -79,16 +80,17 @@ public class ReportSubjectQuestionDTO {
     private String paperType;
 
     public ReportSubjectQuestionDTO(ReportSubjectQuestion r) {
+        DecimalFormat format = new DecimalFormat("####.###");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.questionName = r.getQuestionName();
         this.mainNumber = r.getMainNumber();
         this.subNumber = r.getSubNumber();
-        this.totalScore = new BigDecimal(r.getTotalScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.stdev = new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.scoreRate = new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.fullScoreRate = new BigDecimal(r.getFullScoreRate()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.avgScore = 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.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.paperType = r.getPaperType();
     }
 

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

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.admin.dto;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectTeacherClass;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
@@ -91,21 +92,23 @@ public class ReportSubjectTeacherClassDTO {
     private String relativeAvgScore;
 
     public ReportSubjectTeacherClassDTO(ReportSubjectTeacherClass r) {
+        DecimalFormat format = new DecimalFormat("####.###");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.className = r.getClassName();
         this.teacherName = r.getTeacherName();
-        this.maxScore = new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.minScore = new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.avgScore = new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.passRate = new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.excellentRate = new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.relativeAvgScore = new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP).toString();
+        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.passCount = r.getPassCount();
         this.excellentCount = r.getExcellentCount();
         this.realityCount = r.getRealityCount();
     }
 
+
     public String getSubjectCode() {
         return subjectCode;
     }

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

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.admin.dto;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectTeacher;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
@@ -90,15 +91,16 @@ public class ReportSubjectTeacherDTO {
     private Integer realityCount;
 
     public ReportSubjectTeacherDTO(ReportSubjectTeacher r) {
+        DecimalFormat format = new DecimalFormat("####.###");
         this.subjectCode = r.getSubjectCode();
         this.subjectName = r.getSubjectName();
         this.teacherName = r.getTeacherName();
-        this.maxScore = new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.minScore = new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.avgScore = new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.passRate = new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.excellentRate = new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).toString();
-        this.relativeAvgScore = new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP).toString();
+        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.passCount = r.getPassCount();
         this.excellentCount = r.getExcellentCount();
         this.realityCount = r.getRealityCount();

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectCollegeController.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.stmms.admin.report;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -16,6 +15,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import cn.com.qmth.stmms.admin.dto.ReportSubjectCollegeDTO;
 import cn.com.qmth.stmms.admin.exam.BaseExamController;
 import cn.com.qmth.stmms.biz.report.model.ReportSubjectCollege;
 import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
@@ -66,17 +66,14 @@ public class ReportSubjectCollegeController extends BaseExamController {
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
-        List<ReportSubjectCollege> list = reportSubjectCollegeService.findByQuery(query);
-        for (ReportSubjectCollege r : list) {
-            r.setMaxScore(new BigDecimal(r.getMaxScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setMinScore(new BigDecimal(r.getMinScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setExcellentRate(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+        List<ReportSubjectCollege> result = reportSubjectCollegeService.findByQuery(query);
+        List<ReportSubjectCollegeDTO> list = new ArrayList<>();
+        for (ReportSubjectCollege r : result) {
+            list.add(new ReportSubjectCollegeDTO(r));
         }
         String fileName = "课程电厂成绩分析.xlsx";
         try {
-            new ExportExcel("课程电厂成绩分析", ReportSubjectCollege.class).setDataList(list).write(response, fileName)
+            new ExportExcel("课程电厂成绩分析", ReportSubjectCollegeDTO.class).setDataList(list).write(response, fileName)
                     .dispose();
             return null;
         } catch (Exception e) {