wangliang 4 gadi atpakaļ
vecāks
revīzija
4a51275df4

+ 1 - 1
distributed-print-task/src/main/java/com/qmth/distributed/print/task/job/TimedSyncSchoolJob.java

@@ -21,8 +21,8 @@ public class TimedSyncSchoolJob extends QuartzJobBean {
     @Override
     protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         try {
-            jobService.updateSchoolInfo();
             jobService.updatePrintPlan();
+            jobService.updateSchoolInfo();
         } catch (IOException e) {
             e.printStackTrace();
         }

+ 5 - 3
distributed-print-task/src/main/java/com/qmth/distributed/print/task/job/service/impl/JobServiceImpl.java

@@ -47,9 +47,11 @@ public class JobServiceImpl implements JobService {
         QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<>();
         examPrintPlanQueryWrapper.lambda().ne(ExamPrintPlan::getStatus, PrintPlanStatusEnum.END);
         List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.list(examPrintPlanQueryWrapper);
-        for (ExamPrintPlan examPrintPlan : examPrintPlanList) {
-            if (Objects.nonNull(examPrintPlan.getExamEndTime()) && System.currentTimeMillis() >= examPrintPlan.getExamEndTime()) {
-                examPrintPlan.setStatus(PrintPlanStatusEnum.END);
+        if (Objects.nonNull(examPrintPlanList) && examPrintPlanList.size() > 0) {
+            for (ExamPrintPlan examPrintPlan : examPrintPlanList) {
+                if (Objects.nonNull(examPrintPlan.getExamEndTime()) && System.currentTimeMillis() >= examPrintPlan.getExamEndTime()) {
+                    examPrintPlan.setStatus(PrintPlanStatusEnum.END);
+                }
             }
         }
         examPrintPlanService.saveOrUpdateBatch(examPrintPlanList);