update

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

@@ -311,7 +311,7 @@ public class InspectedController extends BaseExamController {
         return obj;
     }
 
-    @Logging(menu = "取消复核", type = LogType.UPDATE)
+//    @Logging(menu = "取消复核", type = LogType.UPDATE)
     @RequestMapping(value = "/cancel", method = RequestMethod.POST)
     @ResponseBody
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.INSPECTOR, Role.COLLEGE_ADMIN })
@@ -329,8 +329,20 @@ public class InspectedController extends BaseExamController {
             try {
                 lockService.watch(LockType.EXAM_SUBJECT, student.getExamId(), student.getSubjectCode());
                 lockService.waitlock(LockType.STUDENT, studentId);
-                if (inspectedService.cancelByStudent(studentId)) {
-                    RequestUtils.setLog(request,"科目代码："+student.getSubjectCode()+" 准考证号："+student.getExamNumber()+" 试卷取消复核");
+                if (student.getInspected()&&inspectedService.cancelByStudent(studentId)) {
+                    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);
                     obj.accumulate("success", true);
                 } else {
                     obj.accumulate("success", false);
@@ -624,7 +636,7 @@ public class InspectedController extends BaseExamController {
                 try {
                     lockService.watch(LockType.EXAM_SUBJECT, student.getExamId(), student.getSubjectCode());
                     lockService.waitlock(LockType.STUDENT, student.getId());
-                    if(inspectedService.cancelByStudent(id)){
+                    if(student.getInspected()&&inspectedService.cancelByStudent(id)){
                         OperationLog log = new OperationLog();
                         log.setCreateTime(new Date());
                         log.setMenu("取消复核");