ting.yin há 3 anos atrás
pai
commit
0c1123507a

+ 1 - 1
db/init.sql

@@ -13,7 +13,7 @@ CREATE TABLE `pm_break_record` (
   `group_type` varchar(16) COLLATE utf8_bin NOT NULL,
   `group_name` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   `status` varchar(16) COLLATE utf8_bin DEFAULT NULL,
-  `start_number` varchar(255) COLLATE utf8_bin NOT NULL,
+  `start_number` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   `end_number` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `IDX_BREAK_RECORD_001` (`org_id`,`exam_id`,`group_type`),

+ 2 - 2
src/main/java/cn/com/qmth/print/manage/controller/CheckRecordController.java

@@ -30,10 +30,10 @@ public class CheckRecordController extends BaseController {
     }
 
     @RequestMapping("/start")
-    public Object start(@RequestAttribute PmSession accessEntity, @RequestParam Long examId,
+    public Object start(@RequestAttribute PmSession accessEntity, @RequestParam Long id, @RequestParam Long examId,
             @RequestParam String startNumber) {
         Long userId = getAccessUserId(accessEntity);
-        return checkRecordService.start(userId, examId, startNumber);
+        return checkRecordService.start(id, userId, examId, startNumber);
     }
 
     @RequestMapping("/end")

+ 1 - 1
src/main/java/cn/com/qmth/print/manage/service/CheckRecordService.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 public interface CheckRecordService extends IService<CheckRecordEntity> {
 
-    CheckRecordVo start(Long userId, Long examId, String startNumber);
+    CheckRecordVo start(Long id, Long userId, Long examId, String startNumber);
 
     CheckRecordVo end(Long id, Long userId, Long examId, String endNumber);
 

+ 10 - 2
src/main/java/cn/com/qmth/print/manage/service/impl/CheckRecordServiceImpl.java

@@ -45,7 +45,7 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordDao, CheckRec
     private UserService userService;
 
     @Override
-    public CheckRecordVo start(Long userId, Long examId, String startNumber) {
+    public CheckRecordVo start(Long id, Long userId, Long examId, String startNumber) {
         ExamEntity exam = examService.getById(examId);
         if (exam == null) {
             throw new StatusException("找不到考试");
@@ -68,7 +68,15 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordDao, CheckRec
         if (student.getSortNo().longValue() != sortNo.longValue()) {
             throw new StatusException("该分组开始考生不正确");
         }
-        CheckRecordEntity checkRecord = findByGroupTypeAndGroupName(exam.getGroupType(), groupName);
+        CheckRecordEntity checkRecord = null;
+        if (id != null) {
+            checkRecord = this.getById(id);
+        } else {
+            checkRecord = findByGroupTypeAndGroupName(exam.getGroupType(), groupName);
+        }
+        if (!checkRecord.getGroupName().equals(groupName)) {
+            throw new StatusException("该分组开始考生不正确");
+        }
         checkRecord.setStartNumber(startNumber);
         checkRecord.setCreatorId(userId);
         checkRecord.setCreateTime(new Date());