deason 1 ay önce
ebeveyn
işleme
ccf2d857fd

+ 23 - 17
src/main/java/com/qmth/exam/reserve/service/impl/ExamReserveServiceImpl.java

@@ -449,32 +449,38 @@ public class ExamReserveServiceImpl implements ExamReserveService {
                 continue;
             }
 
+            ExamSiteCacheBean examSite = examSiteCacheService.getExamSiteById(bean.getExamSiteId());
+            if (examSite == null) {
+                log.warn("考点被删除!examSiteId:{}", bean.getExamSiteId());
+                continue;
+            }
+
+            TimePeriodEntity timePeriod = timePeriods.get(bean.getTimePeriodId());
+            if (timePeriod == null) {
+                log.warn("预约时段被删除!timePeriodId:{}", bean.getTimePeriodId());
+                continue;
+            }
+
             ApplyVO vo = new ApplyVO();
             vo.setShowTicket(false);
             vo.setAllowCancel(false);
             vo.setCancel(bean.getCancel());
 
-            TimePeriodEntity timePeriod = timePeriods.get(bean.getTimePeriodId());
             vo.setTimePeriodId(bean.getTimePeriodId());
-            if (timePeriod != null) {
-                vo.setTimePeriodStart(timePeriod.getStartTime());
-                vo.setTimePeriodEnd(timePeriod.getEndTime());
-
-                Date curDate = new Date(vo.getTimePeriodStart());
-                if (curDate.after(allowDate) && globalOpen) {
-                    // “当前时段开始时间”在“允许取消时间”之后,可以取消预约
-                    vo.setAllowCancel(true);
-                }
+            vo.setTimePeriodStart(timePeriod.getStartTime());
+            vo.setTimePeriodEnd(timePeriod.getEndTime());
+
+            Date curDate = new Date(vo.getTimePeriodStart());
+            if (curDate.after(allowDate) && globalOpen) {
+                // “当前时段开始时间”在“允许取消时间”之后,可以取消预约
+                vo.setAllowCancel(true);
             }
 
-            ExamSiteCacheBean examSite = examSiteCacheService.getExamSiteById(bean.getExamSiteId());
             vo.setExamSiteId(bean.getExamSiteId());
-            if (examSite != null) {
-                vo.setExamSiteName(examSite.getExamSiteName());
-                vo.setExamSiteAddress(examSite.getExamSiteAddress());
-                vo.setCategoryId(examSite.getCategoryId());
-                vo.setCategoryName(examSite.getCategoryName());
-            }
+            vo.setExamSiteName(examSite.getExamSiteName());
+            vo.setExamSiteAddress(examSite.getExamSiteAddress());
+            vo.setCategoryId(examSite.getCategoryId());
+            vo.setCategoryName(examSite.getCategoryName());
 
             if (!vo.getCancel()) {
                 // 准考证号已生成,则可查看