ting.yin 2 tahun lalu
induk
melakukan
d25e654464

+ 4 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ExamController.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.stmms.admin.exam;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -206,7 +207,9 @@ public class ExamController extends BaseExamController {
 
         ExamInfoVO sheet = new ExamInfoVO();
         sheet.setName("扫描张数");
-        sheet.setAttr("已扫描 " + sheetCount + " 张");
+        long sheetCount2 = new BigDecimal(sheetCount).divide(new BigDecimal(2), 0, BigDecimal.ROUND_HALF_UP)
+                .longValue();
+        sheet.setAttr("已扫描 " + sheetCount2 + " 张");
         sheet.setUrl("/admin/exam/scan");
 
         ExamInfoVO mark = new ExamInfoVO();

+ 5 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScanController.java

@@ -30,6 +30,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import java.math.BigDecimal;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -76,7 +77,10 @@ public class ScanController extends BaseExamController {
                             : ""));
             vo.setTotalCount(studentService.countByExamIdAndSubjectCode(examId, subject.getCode()));
             vo.setScanCount(studentService.countByExamIdAndSubjectCode(examId, subject.getCode(), true));
-            vo.setScanSheetCount(studentService.countSheetCountByExamIdAndSubjectCode(examId, subject.getCode()) / 2);
+            long sheetCount = studentService.countSheetCountByExamIdAndSubjectCode(examId, subject.getCode());
+            long sheetCount2 = new BigDecimal(sheetCount).divide(new BigDecimal(2), 0, BigDecimal.ROUND_HALF_UP)
+                    .longValue();
+            vo.setScanSheetCount(sheetCount2);
             list.add(vo);
         }
 

+ 3 - 3
stmms-web/src/main/java/cn/com/qmth/stmms/admin/vo/ScanInfoVO.java

@@ -14,7 +14,7 @@ public class ScanInfoVO {
     private long scanCount;
 
     @ExcelField(title = "已扫张数", align = 2, sort = 30)
-    private double scanSheetCount;
+    private long scanSheetCount;
 
     public String getName() {
         return name;
@@ -40,11 +40,11 @@ public class ScanInfoVO {
         this.scanCount = scanCount;
     }
 
-    public double getScanSheetCount() {
+    public long getScanSheetCount() {
         return scanSheetCount;
     }
 
-    public void setScanSheetCount(double scanSheetCount) {
+    public void setScanSheetCount(long scanSheetCount) {
         this.scanSheetCount = scanSheetCount;
     }
 

+ 0 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/checkAnswer.jsp

@@ -136,7 +136,6 @@ $('#count-button').click(function(){
     	return;
     }
     $.post('${ctx}/admin/exam/check/answer/count', $("#searchForm").serialize(), function(result){
-        //alert(result);
         $('#count').val(result);
         if(result>0){
             $('#start-button').show();

+ 1 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/studentList.jsp

@@ -219,7 +219,7 @@
                 </c:if>
             
             </td>
-            <td>${student.sheetCount/2}</td>
+            <td><fmt:formatNumber value="${student.sheetCount/2}" type="number" maxFractionDigits="0"/></td>
             <td>
                 <c:if test="${student.breach==true}">
                     <c:if test="${web_user.schoolAdmin==true}">
@@ -296,7 +296,6 @@
     });
 
     $('#packageCode').click(function () {
-        console.log(1111);
         $('#collapse1 > div > ul > li:nth-child(5)').addClass('active');
     });