给分次数校验小数；取消复核log按考生记录

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/InspectedController.java

@@ -1,17 +1,14 @@
 package cn.com.qmth.stmms.admin.exam;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.com.qmth.stmms.biz.exam.model.CollationLabel;
+import cn.com.qmth.stmms.admin.utils.SessionExamUtils;
+import cn.com.qmth.stmms.biz.exam.model.*;
 import cn.com.qmth.stmms.biz.exam.service.*;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,9 +32,6 @@ import cn.com.qmth.stmms.admin.vo.InspectedSubjectVO;
 import cn.com.qmth.stmms.biz.config.service.impl.SystemCache;
 import cn.com.qmth.stmms.biz.exam.bean.ExamStudentVo;
 import cn.com.qmth.stmms.biz.exam.bean.InspectWorkVo;
-import cn.com.qmth.stmms.biz.exam.model.Exam;
-import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
-import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.query.ExamStudentSearchQuery;
 import cn.com.qmth.stmms.biz.exam.query.InspectQuery;
 import cn.com.qmth.stmms.biz.exam.service.query.ExamSubjectSearchQuery;
@@ -105,6 +99,8 @@ public class InspectedController extends BaseExamController {
 
     @Autowired
     private CollationLabelService collationLabelService;
+    @Autowired
+    private OperationLogService logService;
 
     @Value("${slice.split.config}")
     private String splitConfig;
@@ -617,23 +613,32 @@ public class InspectedController extends BaseExamController {
         }
     }
 
-    @Logging(menu = "取消复核", type = LogType.UPDATE)
+//    @Logging(menu = "取消复核", type = LogType.UPDATE)
     @RequestMapping(value = "/batchCancel", method = RequestMethod.POST)
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.INSPECTOR, Role.COLLEGE_ADMIN })
     public String batchCancel(HttpServletRequest request, @RequestParam Integer[] ids) {
         WebUser wu = RequestUtils.getWebUser(request);
-        // String subjectCode = "";
-        StringBuilder sb=new StringBuilder();
         for (Integer id : ids) {
             ExamStudent student = studentService.findById(id);
-            // subjectCode = student.getSubjectCode();
             if (student != null && subjectCheck(student.getSubjectCode(), wu)) {
                 try {
                     lockService.watch(LockType.EXAM_SUBJECT, student.getExamId(), student.getSubjectCode());
                     lockService.waitlock(LockType.STUDENT, student.getId());
-                    inspectedService.cancelByStudent(id);
-                    sb.append(" 科目代码："+student.getSubjectCode());
-                    sb.append(" 准考证号："+student.getExamNumber());
+                    if(inspectedService.cancelByStudent(id)){
+                        OperationLog log = new OperationLog();
+                        log.setCreateTime(new Date());
+                        log.setMenu("取消复核");
+                        log.setType(LogType.UPDATE);
+                        log.setMarker(false);
+                        log.setOperatorId(wu.getId());
+                        log.setIpAddress(wu.getUser().getLastLoginIp());
+                        log.setLoginName(wu.getUser().getLoginName());
+                        int examId = SessionExamUtils.getExamId(request);
+                        log.setExamId(examId > 0 ? examId : null);
+                        log.setSchoolId(wu.getUser().getSchoolId());
+                        log.setDescription("科目代码："+student.getSubjectCode()+" 准考证号："+student.getExamNumber());
+                        logService.save(log);
+                    }
                 } catch (Exception e) {
                     log.error("back inspected error", e);
                 } finally {
@@ -642,8 +647,6 @@ public class InspectedController extends BaseExamController {
                 }
             }
         }
-        sb.append(" 试卷取消复核");
-        RequestUtils.setLog(request, sb.toString());
         return "redirect:/admin/exam/inspected/list";
     }
 

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/questionAdd.jsp

@@ -97,7 +97,7 @@
 		<div class="control-group">
 			<label class="control-label">给分次数</label>
 			<div class="controls">
-				<input name="trackCount" value="${examQuestion.trackCount }" type="number" htmlEscape="false" max="10000" min="1"/>
+				<input name="trackCount" value="${examQuestion.trackCount }" class="digits" type="number" htmlEscape="false" max="10000" min="1"/>
 			</div>
 		</div>
 		<div class="control-group">

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/questionEdit.jsp

@@ -93,7 +93,7 @@
 		<div class="control-group">
 			<label class="control-label">给分次数</label>
 			<div class="controls">
-				<input name="trackCount" value="<c:if test="${examQuestion.trackCount>0 }">${examQuestion.trackCount }</c:if>" type="number" htmlEscape="false" max="10000" min="1" />
+				<input name="trackCount" value="<c:if test="${examQuestion.trackCount>0 }">${examQuestion.trackCount }</c:if>" class="digits"  type="number" htmlEscape="false" max="10000" min="1" />
 			</div>
 		</div>
 		<div class="control-group">