Преглед на файлове

成绩分析中最高分、最低分、平均分均保留两位小数

yin преди 7 месеца
родител
ревизия
4f92d85151

+ 2 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectClassController.java

@@ -68,6 +68,8 @@ public class ReportSubjectClassController extends BaseExamController {
         query.setPageSize(Integer.MAX_VALUE);
         query.setPageSize(Integer.MAX_VALUE);
         List<ReportSubjectClass> list = reportSubjectClassService.findByQuery(query);
         List<ReportSubjectClass> list = reportSubjectClassService.findByQuery(query);
         for (ReportSubjectClass r : list) {
         for (ReportSubjectClass 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.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).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());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());

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

@@ -68,6 +68,8 @@ public class ReportSubjectCollegeController extends BaseExamController {
         query.setPageSize(Integer.MAX_VALUE);
         query.setPageSize(Integer.MAX_VALUE);
         List<ReportSubjectCollege> list = reportSubjectCollegeService.findByQuery(query);
         List<ReportSubjectCollege> list = reportSubjectCollegeService.findByQuery(query);
         for (ReportSubjectCollege r : list) {
         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.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).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());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());

+ 2 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectController.java

@@ -76,6 +76,8 @@ public class ReportSubjectController extends BaseExamController {
         query = reportSubjectService.findByQuery(query);
         query = reportSubjectService.findByQuery(query);
         List<ReportSubject> list = query.getResult();
         List<ReportSubject> list = query.getResult();
         for (ReportSubject r : list) {
         for (ReportSubject 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.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());

+ 3 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectGroupController.java

@@ -75,6 +75,9 @@ public class ReportSubjectGroupController extends BaseExamController {
         query.setPageSize(Integer.MAX_VALUE);
         query.setPageSize(Integer.MAX_VALUE);
         List<ReportSubjectGroup> list = reportSubjectGroupService.findByQuery(query);
         List<ReportSubjectGroup> list = reportSubjectGroupService.findByQuery(query);
         for (ReportSubjectGroup r : list) {
         for (ReportSubjectGroup 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.setTotalScore(new BigDecimal(r.getTotalScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setScoreRate(new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setScoreRate(new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setStdev(new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setStdev(new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).doubleValue());

+ 1 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectQuestionController.java

@@ -73,6 +73,7 @@ public class ReportSubjectQuestionController extends BaseExamController {
         query.setPageSize(Integer.MAX_VALUE);
         query.setPageSize(Integer.MAX_VALUE);
         List<ReportSubjectQuestion> list = reportSubjectQuestionService.findByQuery(query);
         List<ReportSubjectQuestion> list = reportSubjectQuestionService.findByQuery(query);
         for (ReportSubjectQuestion r : list) {
         for (ReportSubjectQuestion r : list) {
+            r.setTotalScore(new BigDecimal(r.getTotalScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setStdev(new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setStdev(new BigDecimal(r.getStdev()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setScoreRate(new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setScoreRate(new BigDecimal(r.getScoreRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());

+ 2 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherClassController.java

@@ -77,6 +77,8 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
         query.setPageSize(Integer.MAX_VALUE);
         query.setPageSize(Integer.MAX_VALUE);
         List<ReportSubjectTeacherClass> list = reportSubjectTeacherClassService.findByQuery(query);
         List<ReportSubjectTeacherClass> list = reportSubjectTeacherClassService.findByQuery(query);
         for (ReportSubjectTeacherClass r : list) {
         for (ReportSubjectTeacherClass 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.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).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());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());

+ 2 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherController.java

@@ -68,6 +68,8 @@ public class ReportSubjectTeacherController extends BaseExamController {
         query.setPageSize(Integer.MAX_VALUE);
         query.setPageSize(Integer.MAX_VALUE);
         List<ReportSubjectTeacher> list = reportSubjectTeacherService.findByQuery(query);
         List<ReportSubjectTeacher> list = reportSubjectTeacherService.findByQuery(query);
         for (ReportSubjectTeacher r : list) {
         for (ReportSubjectTeacher 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.setAvgScore(new BigDecimal(r.getAvgScore()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).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());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());

+ 2 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubject.jsp

@@ -63,8 +63,8 @@
 				<td>${reportSubject.breachCount}</td>
 				<td>${reportSubject.breachCount}</td>
 				<td>${reportSubject.realityCount}</td>
 				<td>${reportSubject.realityCount}</td>
 				<td><fmt:formatNumber type="number" value="${reportSubject.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
 				<td><fmt:formatNumber type="number" value="${reportSubject.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
-				<td>${reportSubject.maxScore}</td>
-				<td>${reportSubject.minScore}</td>
+				<td><fmt:formatNumber type="number" value="${reportSubject.maxScore}" pattern="0.00" maxFractionDigits="2"/></td>
+				<td><fmt:formatNumber type="number" value="${reportSubject.minScore}" pattern="0.00" maxFractionDigits="2"/></td>
 				<td>${reportSubject.passCount}</td>
 				<td>${reportSubject.passCount}</td>
 				<td><fmt:formatNumber type="number" value="${reportSubject.passRate}" pattern="0.00" maxFractionDigits="2"/></td>            
 				<td><fmt:formatNumber type="number" value="${reportSubject.passRate}" pattern="0.00" maxFractionDigits="2"/></td>            
 				<td>${reportSubject.excellentCount}</td>
 				<td>${reportSubject.excellentCount}</td>

+ 2 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectClass.jsp

@@ -74,8 +74,8 @@
             <td>${reportSubjectClass.totalCount}</td>
             <td>${reportSubjectClass.totalCount}</td>
 			<td>${reportSubjectClass.realityCount}</td>
 			<td>${reportSubjectClass.realityCount}</td>
             <td><fmt:formatNumber type="number" value="${reportSubjectClass.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectClass.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
-            <td>${reportSubjectClass.maxScore}</td>
-            <td>${reportSubjectClass.minScore}</td>
+            <td><fmt:formatNumber type="number" value="${reportSubjectClass.maxScore}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${reportSubjectClass.minScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${reportSubjectClass.passCount}</td>
             <td>${reportSubjectClass.passCount}</td>
             <td><fmt:formatNumber type="number" value="${reportSubjectClass.passRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectClass.passRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${reportSubjectClass.excellentCount}</td>
             <td>${reportSubjectClass.excellentCount}</td>

+ 2 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectCollege.jsp

@@ -77,8 +77,8 @@
             <td>${reportSubjectCollege.totalCount}</td>
             <td>${reportSubjectCollege.totalCount}</td>
 			<td>${reportSubjectCollege.realityCount}</td>
 			<td>${reportSubjectCollege.realityCount}</td>
             <td><fmt:formatNumber type="number" value="${reportSubjectCollege.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectCollege.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
-            <td>${reportSubjectCollege.maxScore}</td>
-            <td>${reportSubjectCollege.minScore}</td>
+            <td><fmt:formatNumber type="number" value="${reportSubjectCollege.maxScore}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${reportSubjectCollege.minScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${reportSubjectCollege.passCount}</td>
             <td>${reportSubjectCollege.passCount}</td>
             <td><fmt:formatNumber type="number" value="${reportSubjectCollege.passRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectCollege.passRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${reportSubjectCollege.excellentCount}</td>
             <td>${reportSubjectCollege.excellentCount}</td>

+ 3 - 3
stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectGroup.jsp

@@ -72,9 +72,9 @@
         <tr>
         <tr>
             <td>${group.groupName}</td>
             <td>${group.groupName}</td>
             <td>${group.groupNumber }</td>
             <td>${group.groupNumber }</td>
-            <td>${group.totalScore}</td>
-            <td>${group.maxScore}</td>
-            <td>${group.minScore}</td>
+            <td><fmt:formatNumber type="number" value="${group.totalScore}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${group.maxScore}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${group.minScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${group.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${group.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${group.stdev}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${group.stdev}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${group.coefficient}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${group.coefficient}" pattern="0.00" maxFractionDigits="2"/></td>

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectQuestion.jsp

@@ -85,7 +85,7 @@
             <td>${question.questionName}</td>
             <td>${question.questionName}</td>
             <td>${question.mainNumber}</td>
             <td>${question.mainNumber}</td>
             <td>${question.subNumber}</td>
             <td>${question.subNumber}</td>
-            <td>${question.totalScore}</td>
+            <td><fmt:formatNumber type="number" value="${question.totalScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${question.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${question.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${question.stdev}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${question.stdev}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${question.scoreRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${question.scoreRate}" pattern="0.00" maxFractionDigits="2"/></td>

+ 2 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectTeacher.jsp

@@ -79,8 +79,8 @@
             <td>${reportSubjectteacher.realityCount}</td>
             <td>${reportSubjectteacher.realityCount}</td>
             <td>${reportSubjectteacher.passCount}</td>
             <td>${reportSubjectteacher.passCount}</td>
             <td>${reportSubjectteacher.excellentCount}</td>
             <td>${reportSubjectteacher.excellentCount}</td>
-            <td>${reportSubjectteacher.maxScore}</td>
-            <td>${reportSubjectteacher.minScore}</td>
+            <td><fmt:formatNumber type="number" value="${reportSubjectteacher.maxScore}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${reportSubjectteacher.minScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.passRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.passRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.excellentRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.excellentRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>

+ 2 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectTeacherClass.jsp

@@ -52,8 +52,8 @@
             <td>${reportSubjectteacher.realityCount}</td>
             <td>${reportSubjectteacher.realityCount}</td>
             <td>${reportSubjectteacher.passCount}</td>
             <td>${reportSubjectteacher.passCount}</td>
             <td>${reportSubjectteacher.excellentCount}</td>
             <td>${reportSubjectteacher.excellentCount}</td>
-            <td>${reportSubjectteacher.maxScore}</td>
-            <td>${reportSubjectteacher.minScore}</td>
+            <td><fmt:formatNumber type="number" value="${reportSubjectteacher.maxScore}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${reportSubjectteacher.minScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.passRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.passRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.excellentRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.excellentRate}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>
             <td><fmt:formatNumber type="number" value="${reportSubjectteacher.avgScore}" pattern="0.00" maxFractionDigits="2"/></td>