Merge remote-tracking branch 'origin/main'

2026-07-08 09:26:37 +08:00
parent 1a64de529e ac891ce87e
commit 37a17972af
12 changed files with 798 additions and 356 deletions
@@ -80,6 +80,10 @@ public class SiteCugApplyServiceImpl extends BaseServiceImpl<SiteCugApply> imple
        if (!Boolean.TRUE.equals(siteInfo.getState())) {
            return Map.of(false, "该场地未开启预约");
        }
+        Map<Boolean, String> termDateRangeValidate = validateTermDateRange(apply, siteInfo);
+        if (termDateRangeValidate.containsKey(false)) {
+            return termDateRangeValidate;
+        }
        if (apply.getJoinCount() == null || apply.getJoinCount() <= 0) {
            return Map.of(false, "预约人数必须大于0");
        }
@@ -135,6 +139,26 @@ public class SiteCugApplyServiceImpl extends BaseServiceImpl<SiteCugApply> imple
        return Map.of(true, "");
    }

+    // 分工会预约必须落在后台配置的本学期时间内，批量预约逐条复用该校验防止接口越权提交学期外日期
+    private Map<Boolean, String> validateTermDateRange(SiteCugApply apply, SiteCugInfo siteInfo) {
+        if (!StrUtil.equals(apply.getReserveType(), "union")
+                || StrUtil.hasBlank(siteInfo.getTermStartDate(), siteInfo.getTermEndDate())) {
+            return Map.of(true, "");
+        }
+        try {
+            DateTime reserveStart = DateUtil.parseDateTime(apply.getReserveStartTime());
+            DateTime reserveEnd = DateUtil.parseDateTime(apply.getReserveEndTime());
+            Date termStart = DateUtil.beginOfDay(DateUtil.parseDate(siteInfo.getTermStartDate()));
+            Date termEnd = DateUtil.endOfDay(DateUtil.parseDate(siteInfo.getTermEndDate()));
+            if (reserveStart.isBefore(termStart) || reserveEnd.isAfter(termEnd)) {
+                return Map.of(false, "预约时间必须在本学期时间范围内");
+            }
+            return Map.of(true, "");
+        } catch (Exception e) {
+            return Map.of(false, "本学期时间配置有误，请联系管理员处理");
+        }
+    }
+
    @Override
    public Map<Boolean, String> occupyRecord(String id, String message, boolean sendMsg) {
        if (StrUtil.isBlank(message)) {