Browse Source

修复导出分段统计比例为百分比;正考转缺考清空客观题得分;修复大题导出验证

ting.yin 6 years ago
parent
commit
db2191dce1

+ 8 - 8
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectRangeController.java

@@ -63,14 +63,14 @@ public class ReportSubjectRangeController extends BaseExamController {
         query = reportSubjectRangeService.findByQuery(query);
         List<ReportSubjectRange> list = query.getResult();
         for (ReportSubjectRange r : list) {
-            r.setPercent0_49(new BigDecimal(r.getPercent0_49()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent50_59(new BigDecimal(r.getPercent50_59()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent60_69(new BigDecimal(r.getPercent60_69()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent70_79(new BigDecimal(r.getPercent70_79()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent80_89(new BigDecimal(r.getPercent80_89()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent90_100(new BigDecimal(r.getPercent90_100()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent_lt60(new BigDecimal(r.getPercent_lt60()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-            r.setPercent_mte60(new BigDecimal(r.getPercent_mte60()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent0_49(new BigDecimal(r.getPercent0_49()*100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent50_59(new BigDecimal(r.getPercent50_59()*100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent60_69(new BigDecimal(r.getPercent60_69()*100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent70_79(new BigDecimal(r.getPercent70_79()*100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent80_89(new BigDecimal(r.getPercent80_89()*100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent90_100(new BigDecimal(r.getPercent90_100()*100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent_lt60(new BigDecimal(r.getPercent_lt60()*100).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            r.setPercent_mte60(new BigDecimal(r.getPercent_mte60()*100).setScale(2, RoundingMode.HALF_UP).doubleValue());
         }
         String fileName = "课程分段统计.xlsx";
         try {

+ 1 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/BaseController.java

@@ -183,6 +183,7 @@ public class BaseController {
         calculateObjectiveScore(student);
         if(!old.isAbsent() && student.isAbsent()){//正考转缺考
             student.setObjectiveScore(0d);
+            student.setObjectiveScoreList(null);
             student.setSubjectiveScore(0d);
             student.setSubjectiveScoreList(null);
             studentService.save(student);

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

@@ -84,7 +84,7 @@
 </table>
 <script type="text/javascript">
 $("#export-button").click(function(){
-    if ($("#subjectCode").val() == null || $("#subjectCode").val() == '') {
+    if ($("#subject-select").val() == null || $("#subject-select").val() == '') {
         alert('请选择科目');
         return;
     }