haogh 7 сар өмнө
parent
commit
a9d26693c9

+ 4 - 0
src/main/java/com/qmth/exam/reserve/service/impl/StudentAutoAssignServiceImpl.java

@@ -17,6 +17,7 @@ import com.qmth.exam.reserve.dao.StudentApplyDao;
 import com.qmth.exam.reserve.entity.*;
 import com.qmth.exam.reserve.service.*;
 import com.qmth.exam.reserve.util.DateUtil;
+import com.qmth.exam.reserve.util.UnionUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.redisson.api.RLock;
@@ -178,6 +179,9 @@ public class StudentAutoAssignServiceImpl extends ServiceImpl<StudentApplyDao, S
         // 教学点未设置,则为所有的时段
         if (CollectionUtils.isEmpty(timePeriodExamSiteList)) {
             timePeriodExamSiteList = timeList;
+        } else {
+            // 解决教学点管理员在设置了预约日期后 学校管理员有新增预约时间段的场景
+            timePeriodExamSiteList  = UnionUtil.unionByAttribute(timePeriodExamSiteList, timeList, TimePeriodExamSiteBean::getTimePeriodId);
         }
         // 只取可以预约的时段
         timePeriodExamSiteList = listNoCancelExamTimePeriod(timePeriodExamSiteList);