Bläddra i källkod

加入推送云阅卷数据可重新推送

wangliang 2 år sedan
förälder
incheckning
48240a8a56

+ 1 - 3
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamController.java

@@ -593,14 +593,12 @@ public class TEExamController {
                     .last(" limit 1 ");
             tbTaskHistory = taskHistoryService.getOne(tbTaskHistoryQueryWrapper);
 
-            if (Objects.isNull(tbTaskHistory)) {
+            if (Objects.isNull(tbTaskHistory) || (tbTaskHistory.getStatus() == TaskStatusEnum.FINISH && (Objects.nonNull(tbTaskHistory.getProgress()) && tbTaskHistory.getProgress().doubleValue() == 100D))) {
                 //往任务表里插一条数据
                 tbTaskHistory = new TBTaskHistory(TaskTypeEnum.CLOUD_MARK_DATA_PUSH, TaskStatusEnum.INIT,
                         SystemConstant.DATA_PUSH_INIT, 0d, tbUser.getId(), tbUser.getOrgId());
                 tbTaskHistory.setExamId(examCacheBean.getId());
                 taskHistoryService.save(tbTaskHistory);
-            } else if (tbTaskHistory.getStatus() == TaskStatusEnum.FINISH && (Objects.nonNull(tbTaskHistory.getProgress()) && tbTaskHistory.getProgress().doubleValue() == 100D)) {
-                throw new BusinessException("当前推送任务已完成");
             } else if (tbTaskHistory.getStatus() != TaskStatusEnum.FINISH) {
                 throw new BusinessException("当前推送任务正在进行中,请稍后再试!");
             }