update

src/main/java/cn/com/qmth/scancentral/controller/admin/BatchVerifyController.java

@@ -45,7 +45,7 @@ public class BatchVerifyController extends BaseController {
     @RequestMapping(value = "/release", method = RequestMethod.POST)
     public Object answerRelease(@RequestParam Long examId) {
         User user = getAccessUser();
-        batchService.releaseCheckImageTask(examId, user);
+        batchService.releaseVerifyTask(examId, user.getAccount());
         return success(true);
     }
 }

src/main/java/cn/com/qmth/scancentral/controller/scan/ScanBatchController.java

@@ -66,11 +66,11 @@ public class ScanBatchController extends BaseController {
         return batchService.sliceUpload(batchId, examNumber, paperNumber, pageIndex, index, file, md5);
     }
 
-    @ApiOperation(value = "答题卡扫描批次提交审核/查询审核结果")
-    @RequestMapping(value = "/verify", method = RequestMethod.POST)
-    public BatchVerifyVo batchVerify(@RequestParam Long id) {
-        return batchService.batchVerify(id);
-    }
+//    @ApiOperation(value = "答题卡扫描批次提交审核/查询审核结果")
+//    @RequestMapping(value = "/verify", method = RequestMethod.POST)
+//    public BatchVerifyVo batchVerify(@RequestParam Long id) {
+//        return batchService.batchVerify(id);
+//    }
 
     @ApiOperation(value = "答题卡扫描批次完成")
     @RequestMapping(value = "/finish", method = RequestMethod.POST)

src/main/java/cn/com/qmth/scancentral/service/BatchService.java

@@ -41,9 +41,7 @@ public interface BatchService extends IService<BatchEntity> {
 
     AnswerSaveVo batchSave(AnswerDomain domain, User user);
 
-    void verify(Long batchId, Boolean comfirm, User user);
-
-    BatchVerifyVo batchVerify(Long id);
+    BatchVerifyVo verify(Long batchId, Boolean comfirm, User user);
 
     BatchFinishVo batchFinish(Long id);
 

src/main/java/cn/com/qmth/scancentral/service/impl/BatchServiceImpl.java

@@ -380,32 +380,12 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
 
     @Transactional
     @Override
-    public void verify(Long batchId, Boolean comfirm, User user) {
+    public BatchVerifyVo verify(Long batchId, Boolean comfirm, User user) {
         BatchEntity entity = this.getById(batchId);
         if (entity == null) {
             throw new ParameterException("批次不存在");
         }
-        if (!VerifyStatus.WAITING.equals(entity.getVerifyStatus())) {
-            throw new ParameterException("批次已被处理");
-        }
-        if (comfirm) {
-            updateBatchAssignedStudentData(user, batchId, entity.getExamId());
-            entity.setVerifyStatus(VerifyStatus.CONFIRM);
-        } else {
-            entity.setVerifyStatus(VerifyStatus.REJECT);
-        }
-        entity.setUpdateTime(System.currentTimeMillis());
-        this.saveOrUpdate(entity);
-    }
-
-    @Transactional
-    @Override
-    public BatchVerifyVo batchVerify(Long id) {
-        BatchEntity entity = this.getById(id);
-        if (entity == null) {
-            throw new ParameterException("批次不存在");
-        }
-        Integer count = findStudentCountByBatch(id);
+        Integer count = findStudentCountByBatch(batchId);
         if (count == null || count == 0) {
             throw new ParameterException("该批次未上传图片");
         }
@@ -417,6 +397,18 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
             entity.setVerifyStatus(VerifyStatus.WAITING);
             this.saveOrUpdate(entity);
         }
+        if (!VerifyStatus.WAITING.equals(entity.getVerifyStatus())) {
+            throw new ParameterException("批次已被处理");
+        }
+        if (comfirm) {
+            updateBatchAssignedStudentData(user, batchId, entity.getExamId());
+            entity.setVerifyStatus(VerifyStatus.CONFIRM);
+        } else {
+            entity.setVerifyStatus(VerifyStatus.REJECT);
+        }
+        entity.setUpdateTime(System.currentTimeMillis());
+        this.saveOrUpdate(entity);
+        this.releaseVerifyTask(entity);
         BatchVerifyVo vo = new BatchVerifyVo();
         vo.setStatus(entity.getVerifyStatus());
         vo.setUpdateTime(entity.getUpdateTime());