wangliang 3 سال پیش
والد
کامیت
bb947d08f9
1فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 6 2
      distributed-print/src/main/java/com/qmth/distributed/print/api/NotifyApiController.java

+ 6 - 2
distributed-print/src/main/java/com/qmth/distributed/print/api/NotifyApiController.java

@@ -106,9 +106,13 @@ public class NotifyApiController {
                 } else if (taskStatus == TaskStatusEnum.FINISH) {
                     gradeBatch.setStatus(GradeAnalyzePaperStatusEnum.FINISH_CALCULATE);
                 }
-                gradeBatch.setProgress(calculateNotifyResult.getProgress());
+                if (Objects.nonNull(calculateNotifyResult.getProgress())) {
+                    gradeBatch.setProgress(calculateNotifyResult.getProgress());
+                }
                 gradeBatch.setNotifyTime(System.currentTimeMillis());
-                gradeBatch.setResult(Objects.nonNull(calculateNotifyResult.getResult()) ? TaskResultEnum.valueOf(calculateNotifyResult.getResult()) : null);
+                if (Objects.nonNull(calculateNotifyResult.getResult())) {
+                    gradeBatch.setResult(TaskResultEnum.valueOf(calculateNotifyResult.getResult()));
+                }
                 gradeBatchService.updateById(gradeBatch);
 
                 QueryWrapper<GradeBatchPaper> gradeBatchPaperQueryWrapper = new QueryWrapper<>();