Commit b49e611e authored by wujipeng's avatar wujipeng
Browse files

bug修复

parent 3e48b362
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/** 新版编辑弹窗一次保存整行上午、下午课程的请求。 */ /** 管理端编辑弹窗一次保存同一排课组课程的请求。 */
@Data @Data
public class CourseAdminScheduleGroupSaveDTO { public class CourseAdminScheduleGroupSaveDTO {
...@@ -14,6 +14,6 @@ public class CourseAdminScheduleGroupSaveDTO { ...@@ -14,6 +14,6 @@ public class CourseAdminScheduleGroupSaveDTO {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date date; private Date date;
/** 一至两条课程,且上午、下午最多各一条。 */ /** 一至一百条同日课程,课程之间按实际时段校验冲突。 */
private List<CourseAdminScheduleItemSaveDTO> courses; private List<CourseAdminScheduleItemSaveDTO> courses;
} }
...@@ -6,21 +6,21 @@ import java.math.BigDecimal; ...@@ -6,21 +6,21 @@ import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
* 编辑一个排课组时提交的独立上午或下午课程。 * 编辑一个排课组时提交的独立课程。
* *
* <p>已有课程必须回传id以保留签到等业务引用;新增的上午或下午课程不传id。 * <p>已有课程必须回传id以保留签到等业务引用;新增课程不传id。
* 日期统一放在排课组请求上,防止同一组出现不同日期。</p> * 日期统一放在排课组请求上,防止同一组出现不同日期。</p>
*/ */
@Data @Data
public class CourseAdminScheduleItemSaveDTO { public class CourseAdminScheduleItemSaveDTO {
/** 已有课程ID;新增期间课程时为空。 */ /** 已有课程ID;新增课程时为空。 */
private Integer id; private Integer id;
/** 课次数量,按照新版页面允许0到40。 */ /** 课次数量,按照新版页面允许0到40。 */
private Integer subjectTimes; private Integer subjectTimes;
/** 同一期间内的一个或多个HH:mm-HH:mm时间段。 */ /** 一个或多个HH:mm-HH:mm时间段,允许同时覆盖上午和下午。 */
private List<String> timeFrames; private List<String> timeFrames;
/** 课时数,允许0到16并以0.5递增。 */ /** 课时数,允许0到16并以0.5递增。 */
......
...@@ -35,8 +35,8 @@ public class ClassSubjectEntity { ...@@ -35,8 +35,8 @@ public class ClassSubjectEntity {
/** /**
* 页面排课行分组ID。 * 页面排课行分组ID。
* *
* <p>上午和下午课程仍各自保留独立主键,以便签到、请假和评价继续精确关联; * <p>同一排课组中的课程仍各自保留独立主键,以便签到、请假和评价继续精确关联;
* 同一页面行内的课程通过本字段聚合,不改变任何历史{@code subject_id}关系。</p> * 页面通过本字段聚合同日课程,不改变任何历史{@code subject_id}关系。</p>
*/ */
private String scheduleGroupId; private String scheduleGroupId;
......
...@@ -10,7 +10,7 @@ import java.util.List; ...@@ -10,7 +10,7 @@ import java.util.List;
/** /**
* 新版课程表中的一行排课。 * 新版课程表中的一行排课。
* *
* <p>一行通常包含上午、下午两个独立课程item;每个item仍拥有自己的课程ID, * <p>一行可包含多条同日独立课程,每条课程按实际时段判断冲突并拥有自己的课程ID;
* 本对象只负责页面聚合和汇总,不作为签到等业务的关联目标。</p> * 本对象只负责页面聚合和汇总,不作为签到等业务的关联目标。</p>
*/ */
@Data @Data
......
...@@ -14,7 +14,7 @@ public class CourseAdminScheduleVO { ...@@ -14,7 +14,7 @@ public class CourseAdminScheduleVO {
private Integer id; private Integer id;
private Integer classId; private Integer classId;
/** 同一页面排课行内的上午、下午课程共享此ID。 */ /** 同一页面排课组内的同日课程共享此ID。 */
private String scheduleGroupId; private String scheduleGroupId;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
...@@ -31,7 +31,7 @@ public class CourseAdminScheduleVO { ...@@ -31,7 +31,7 @@ public class CourseAdminScheduleVO {
private String timeFrame; private String timeFrame;
private List<String> timeFrames; private List<String> timeFrames;
/** 根据时间段派生:AM、PM;历史跨上午下午记录返回ALL_DAY。 */ /** 根据时间段派生:AM、PM,或同时覆盖上午和下午的ALL_DAY。 */
private String period; private String period;
private BigDecimal subjectHour; private BigDecimal subjectHour;
private String subjectName; private String subjectName;
......
...@@ -27,7 +27,7 @@ public interface CourseAdminService { ...@@ -27,7 +27,7 @@ public interface CourseAdminService {
CourseAdminScheduleVO update(Integer courseId, CourseAdminSaveDTO request); CourseAdminScheduleVO update(Integer courseId, CourseAdminSaveDTO request);
/** 一次保存页面同一行内的一至两条上午、下午独立课程。 */ /** 一次保存页面同一排课组内的一至一百条同日独立课程,并按实际时段检查冲突。 */
CourseAdminScheduleGroupVO updateSchedule(String scheduleGroupId, CourseAdminScheduleGroupVO updateSchedule(String scheduleGroupId,
CourseAdminScheduleGroupSaveDTO request); CourseAdminScheduleGroupSaveDTO request);
......
...@@ -152,30 +152,26 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -152,30 +152,26 @@ public class CourseAdminServiceImpl implements CourseAdminService {
Date now = new Date(); Date now = new Date();
Map<LocalDate, String> groupIdsByDate = new HashMap<>(); Map<LocalDate, String> groupIdsByDate = new HashMap<>();
Map<LocalDate, Set<String>> periodsByDate = new HashMap<>(); List<PreparedCourse> submittedCourses = new ArrayList<>();
for (int index = 0; index < request.getCourses().size(); index++) { for (int index = 0; index < request.getCourses().size(); index++) {
CourseAdminSaveDTO item = request.getCourses().get(index); CourseAdminSaveDTO item = request.getCourses().get(index);
try { try {
PreparedCourse prepared = prepareCourse( PreparedCourse prepared = prepareCourse(
item, request.getClassId(), managedClass, batchType); item, request.getClassId(), managedClass, batchType);
validateNewCourseDate(prepared, managedClass); validateNewCourseDate(prepared, managedClass);
requireWritablePeriod(prepared.period);
LocalDate courseDate = toLocalDate(prepared.entity.getDate()); LocalDate courseDate = toLocalDate(prepared.entity.getDate());
Set<String> datePeriods = periodsByDate.computeIfAbsent( // 同一批请求中相同日期的课程共享排课组;不同批次不会误合并历史数据。
courseDate, ignored -> new HashSet<>());
if (!datePeriods.add(prepared.period)) {
throw new BusinessException("同一天的上午或下午最多只能添加一节课程");
}
// 同一批请求中相同日期的上午、下午共享排课组;不同批次不会误合并历史数据。
prepared.entity.setScheduleGroupId(groupIdsByDate.computeIfAbsent( prepared.entity.setScheduleGroupId(groupIdsByDate.computeIfAbsent(
courseDate, ignored -> IdWorker.getIdStr())); courseDate, ignored -> IdWorker.getIdStr()));
ensureNoSubmittedConflict(prepared, submittedCourses);
ensureNoConflict(prepared.entity, prepared.timeRanges, Collections.emptyList()); ensureNoConflict(prepared.entity, prepared.timeRanges, Collections.emptyList());
prepared.entity.setCreateTime(now); prepared.entity.setCreateTime(now);
prepared.entity.setUpdateTime(now); prepared.entity.setUpdateTime(now);
if (classSubjectMapper.insert(prepared.entity) != 1) { if (classSubjectMapper.insert(prepared.entity) != 1) {
throw new BusinessException("课程新增失败,请稍后重试"); throw new BusinessException("课程新增失败,请稍后重试");
} }
submittedCourses.add(prepared);
} catch (BusinessException e) { } catch (BusinessException e) {
// 批量请求指出具体行号,页面可直接定位到错误行。 // 批量请求指出具体行号,页面可直接定位到错误行。
throw new BusinessException("第" + (index + 1) + "节课程:" + e.getMessage()); throw new BusinessException("第" + (index + 1) + "节课程:" + e.getMessage());
...@@ -209,11 +205,9 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -209,11 +205,9 @@ public class CourseAdminServiceImpl implements CourseAdminService {
rejectIfCourseHasDependencies(courseId, "课程已产生签到、请假或评价数据,不能直接编辑"); rejectIfCourseHasDependencies(courseId, "课程已产生签到、请假或评价数据,不能直接编辑");
PreparedCourse prepared = prepareCourse(request, existing.getClassId(), managedClass, null); PreparedCourse prepared = prepareCourse(request, existing.getClassId(), managedClass, null);
requireWritablePeriod(prepared.period);
prepared.entity.setId(courseId); prepared.entity.setId(courseId);
prepared.entity.setScheduleGroupId(resolveStoredGroupId(existing)); prepared.entity.setScheduleGroupId(resolveStoredGroupId(existing));
prepared.entity.setUpdateTime(new Date()); prepared.entity.setUpdateTime(new Date());
ensureNoDuplicatePeriodInStoredGroup(existing, prepared.period, courseId);
ensureNoConflict(prepared.entity, prepared.timeRanges, ensureNoConflict(prepared.entity, prepared.timeRanges,
Collections.singletonList(courseId)); Collections.singletonList(courseId));
if (classSubjectMapper.updateAdminCourse(prepared.entity) != 1) { if (classSubjectMapper.updateAdminCourse(prepared.entity) != 1) {
...@@ -231,8 +225,8 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -231,8 +225,8 @@ public class CourseAdminServiceImpl implements CourseAdminService {
/** /**
* 补齐独立课程的结构化时段与期间标识。 * 补齐独立课程的结构化时段与期间标识。
* *
* <p>读取历史数据时不执行新版写入校验:旧记录可能同时覆盖上午、下午, * <p>课程允许同时覆盖上午、下午,此类记录以ALL_DAY返回。历史脏数据仍需容错展示,
* 此类记录以ALL_DAY返回,管理员在无下游业务数据时可通过组编辑拆成两条。</p> * 精确的格式错误会在编辑或冲突校验时提示管理员处理。</p>
*/ */
private void populateCourseReadFields(CourseAdminScheduleVO course) { private void populateCourseReadFields(CourseAdminScheduleVO course) {
List<String> frames = splitStoredFrames(course.getTimeFrame()); List<String> frames = splitStoredFrames(course.getTimeFrame());
...@@ -308,17 +302,13 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -308,17 +302,13 @@ public class CourseAdminServiceImpl implements CourseAdminService {
lockTeachers(collectScheduleTeacherIds(existingCourses, request.getCourses())); lockTeachers(collectScheduleTeacherIds(existingCourses, request.getCourses()));
Set<Integer> submittedIds = new HashSet<>(); Set<Integer> submittedIds = new HashSet<>();
Set<String> submittedPeriods = new HashSet<>();
List<PreparedCourse> preparedCourses = new ArrayList<>(); List<PreparedCourse> preparedCourses = new ArrayList<>();
for (int index = 0; index < request.getCourses().size(); index++) { for (int index = 0; index < request.getCourses().size(); index++) {
CourseAdminScheduleItemSaveDTO item = request.getCourses().get(index); CourseAdminScheduleItemSaveDTO item = request.getCourses().get(index);
try { try {
PreparedCourse prepared = prepareCourse(toCourseSaveRequest(request.getDate(), item), PreparedCourse prepared = prepareCourse(toCourseSaveRequest(request.getDate(), item),
classId, managedClass, null); classId, managedClass, null);
requireWritablePeriod(prepared.period); ensureNoSubmittedConflict(prepared, preparedCourses);
if (!submittedPeriods.add(prepared.period)) {
throw new BusinessException("上午或下午最多只能保留一节课程");
}
prepared.entity.setScheduleGroupId(normalizedGroupId); prepared.entity.setScheduleGroupId(normalizedGroupId);
if (item.getId() != null) { if (item.getId() != null) {
...@@ -487,7 +477,6 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -487,7 +477,6 @@ public class CourseAdminServiceImpl implements CourseAdminService {
String remark = optionalText(request.getRemark(), "课程备注", String remark = optionalText(request.getRemark(), "课程备注",
CourseAdminConstants.MAX_REMARK_LENGTH); CourseAdminConstants.MAX_REMARK_LENGTH);
List<TimeRange> ranges = normalizeTimeFrames(request.getTimeFrames()); List<TimeRange> ranges = normalizeTimeFrames(request.getTimeFrames());
String period = resolvePeriod(ranges);
ClassSubjectEntity entity = new ClassSubjectEntity(); ClassSubjectEntity entity = new ClassSubjectEntity();
entity.setClassId(classId); entity.setClassId(classId);
...@@ -502,7 +491,7 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -502,7 +491,7 @@ public class CourseAdminServiceImpl implements CourseAdminService {
entity.setLocation(location); entity.setLocation(location);
entity.setType(type); entity.setType(type);
entity.setRemark(remark); entity.setRemark(remark);
return new PreparedCourse(entity, ranges, period); return new PreparedCourse(entity, ranges);
} }
/** /**
...@@ -536,6 +525,27 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -536,6 +525,27 @@ public class CourseAdminServiceImpl implements CourseAdminService {
} }
} }
/**
* 校验同一次请求中已通过校验的课程,避免仅依赖数据库查询发现批次内部冲突。
*
* <p>批量新增可能包含不同日期,因此只比较同一天的数据;排课组编辑中的课程天然同日。
* 两个入口都固定为同一班级,只要实际时段重叠就属于班级课程冲突。错误中返回前一行序号,
* 便于页面直接定位需要调整的两条课程。</p>
*/
private void ensureNoSubmittedConflict(
PreparedCourse current, List<PreparedCourse> acceptedCourses) {
LocalDate currentDate = toLocalDate(current.entity.getDate());
for (int index = 0; index < acceptedCourses.size(); index++) {
PreparedCourse accepted = acceptedCourses.get(index);
if (!currentDate.equals(toLocalDate(accepted.entity.getDate()))) {
continue;
}
if (overlaps(current.timeRanges, accepted.timeRanges)) {
throw new BusinessException("与第" + (index + 1) + "节课程时间冲突");
}
}
}
/** 将前端提交的时段校验、排序并规范为不可重叠的时间范围。 */ /** 将前端提交的时段校验、排序并规范为不可重叠的时间范围。 */
private List<TimeRange> normalizeTimeFrames(List<String> frames) { private List<TimeRange> normalizeTimeFrames(List<String> frames) {
if (frames == null || frames.isEmpty()) { if (frames == null || frames.isEmpty()) {
...@@ -580,13 +590,6 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -580,13 +590,6 @@ public class CourseAdminServiceImpl implements CourseAdminService {
return allAfternoon ? PERIOD_PM : PERIOD_ALL_DAY; return allAfternoon ? PERIOD_PM : PERIOD_ALL_DAY;
} }
/** 新版写接口要求一行只表示上午或下午,避免拆分时无法可靠分摊课时。 */
private void requireWritablePeriod(String period) {
if (PERIOD_ALL_DAY.equals(period)) {
throw new BusinessException("同一行时间段不能同时跨上午和下午,请拆成两行提交");
}
}
private TimeRange parseTimeRange(String value) { private TimeRange parseTimeRange(String value) {
String normalized = trimToNull(value); String normalized = trimToNull(value);
if (normalized == null) { if (normalized == null) {
...@@ -642,8 +645,8 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -642,8 +645,8 @@ public class CourseAdminServiceImpl implements CourseAdminService {
if (request.getCourses() == null || request.getCourses().isEmpty()) { if (request.getCourses() == null || request.getCourses().isEmpty()) {
throw new BusinessException("排课组至少需要保留一节课程"); throw new BusinessException("排课组至少需要保留一节课程");
} }
if (request.getCourses().size() > 2) { if (request.getCourses().size() > CourseAdminConstants.MAX_BATCH_SIZE) {
throw new BusinessException("排课组最多包含上午、下午两节课程"); throw new BusinessException("排课组一次最多保存100节课程");
} }
} }
...@@ -678,24 +681,6 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -678,24 +681,6 @@ public class CourseAdminServiceImpl implements CourseAdminService {
return normalized; return normalized;
} }
/**
* 旧单课程编辑接口也遵守“上午、下午各一条”约束,防止绕过组接口写入重复期间。
*/
private void ensureNoDuplicatePeriodInStoredGroup(
ClassSubjectEntity existing, String newPeriod, Integer excludeId) {
String groupId = trimToNull(existing.getScheduleGroupId());
if (groupId == null) return;
List<ClassSubjectEntity> siblings = classSubjectMapper.selectAdminCourseGroupEntities(groupId);
if (siblings == null) return;
for (ClassSubjectEntity sibling : siblings) {
if (Objects.equals(sibling.getId(), excludeId)) continue;
String siblingPeriod = resolvePeriod(normalizeStoredTimeFrames(sibling.getTimeFrame()));
if (newPeriod.equals(siblingPeriod)) {
throw new BusinessException("当前排课组已存在同一上午或下午课程");
}
}
}
private String resolveStoredGroupId(ClassSubjectEntity existing) { private String resolveStoredGroupId(ClassSubjectEntity existing) {
String groupId = trimToNull(existing.getScheduleGroupId()); String groupId = trimToNull(existing.getScheduleGroupId());
return groupId == null ? "legacy-" + existing.getId() : groupId; return groupId == null ? "legacy-" + existing.getId() : groupId;
...@@ -919,13 +904,10 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -919,13 +904,10 @@ public class CourseAdminServiceImpl implements CourseAdminService {
private static final class PreparedCourse { private static final class PreparedCourse {
private final ClassSubjectEntity entity; private final ClassSubjectEntity entity;
private final List<TimeRange> timeRanges; private final List<TimeRange> timeRanges;
private final String period;
private PreparedCourse(ClassSubjectEntity entity, List<TimeRange> timeRanges, private PreparedCourse(ClassSubjectEntity entity, List<TimeRange> timeRanges) {
String period) {
this.entity = entity; this.entity = entity;
this.timeRanges = timeRanges; this.timeRanges = timeRanges;
this.period = period;
} }
} }
......
...@@ -8,7 +8,7 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理 ...@@ -8,7 +8,7 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理
1. `src/main/resources/sql/class_management.sql` 1. `src/main/resources/sql/class_management.sql`
2. `src/main/resources/sql/course_management.sql` 2. `src/main/resources/sql/course_management.sql`
课程脚本会补充 `class_subject.schedule_group_id`、审计列和查询索引。上午、下午课程仍分别 课程脚本会补充 `class_subject.schedule_group_id`、审计列和查询索引。组内课程仍分别
保存为独立 `class_subject` 记录,因此原有签到、请假和评价表继续使用课程 `id`,不需要迁移 保存为独立 `class_subject` 记录,因此原有签到、请假和评价表继续使用课程 `id`,不需要迁移
任何业务外键。旧课程会回填为独立排课组,避免把同日历史记录错误合并。 任何业务外键。旧课程会回填为独立排课组,避免把同日历史记录错误合并。
...@@ -35,7 +35,7 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理 ...@@ -35,7 +35,7 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理
响应同时保留两种数据结构: 响应同时保留两种数据结构:
- `courses`:独立课程平铺数组,兼容旧调用方; - `courses`:独立课程平铺数组,兼容旧调用方;
- `schedules`:新版页面使用的排课组数组,同一行的上午、下午课程位于 `items` 中。 - `schedules`:新版页面使用的排课组数组,同一行的同日课程位于 `items` 中。
```json ```json
{ {
...@@ -83,14 +83,14 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理 ...@@ -83,14 +83,14 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理
- `AM`:全部时段均在12:00前结束; - `AM`:全部时段均在12:00前结束;
- `PM`:全部时段均从12:00或之后开始; - `PM`:全部时段均从12:00或之后开始;
- `ALL_DAY`:仅用于兼容历史跨上午、下午记录,新写接口不接受此类型。 - `ALL_DAY`:单个时段跨越12:00,或多个时段同时分布在上午和下午。
## 4. 批量新增课程 ## 4. 批量新增课程
`POST /class/subject/admin/batch` `POST /class/subject/admin/batch`
新版页面在批次顶部统一选择课程类型,每行分别选择上课日期。同一请求中日期相同的上午、 新版页面在批次顶部统一选择课程类型,每行分别选择上课日期。同一请求中日期相同的课程行
下午行会自动获得同一个 `scheduleGroupId`。 会自动获得同一个 `scheduleGroupId`。
```json ```json
{ {
...@@ -129,8 +129,8 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理 ...@@ -129,8 +129,8 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理
- 日期必须位于班级培训起止日期内,星期由服务端计算; - 日期必须位于班级培训起止日期内,星期由服务端计算;
- 课次允许0~40,课时允许0~16并以0.5递增; - 课次允许0~40,课时允许0~16并以0.5递增;
- 每行允许1~8个时段,格式为 `HH:mm-HH:mm`,兼容 `~`、`—`、`–`、`→`; - 每行允许1~8个时段,格式为 `HH:mm-HH:mm`,兼容 `~`、`—`、`–`、`→`;
- 同一行只能属于上午或下午,跨越12:00必须拆成两行; - 同一行允许单个时段跨越12:00,也允许多个时段同时分布在上午和下午;
- 同一日期最多提交一条上午和一条下午课程; - 同一日期可提交多条课程,课程之间按实际时段判断冲突;
- 同班级或同教师的时段不能重叠,首尾相接不算冲突; - 同班级或同教师的时段不能重叠,首尾相接不算冲突;
- 课程名称最多100字,地点最多255字,备注最多1000字。 - 课程名称最多100字,地点最多255字,备注最多1000字。
...@@ -140,8 +140,8 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理 ...@@ -140,8 +140,8 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理
`PUT /class/subject/admin/schedules/{scheduleGroupId}` `PUT /class/subject/admin/schedules/{scheduleGroupId}`
新版编辑弹窗使用本接口一次保存上午、下午课程。组级日期只提交一次;已有课程必须回传 新版编辑弹窗使用本接口一次保存同一排课组内的课程,最多100节。组级日期只提交一次;
`id`,新增的期间课程不传 `id`。请求未包含的旧课程表示删除。 已有课程必须回传 `id`,新增课程不传 `id`。请求未包含的旧课程表示删除。
```json ```json
{ {
...@@ -177,12 +177,12 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理 ...@@ -177,12 +177,12 @@ JWT解析当前用户并校验管理员角色,不接受客户端提交管理
## 6. 兼容的单课程编辑与删除 ## 6. 兼容的单课程编辑与删除
- `PUT /class/subject/admin/{courseId}`:保留旧单课程编辑接口,同时执行期间和冲突校验; - `PUT /class/subject/admin/{courseId}`:保留旧单课程编辑接口,同时执行时段和冲突校验;
- `DELETE /class/subject/admin/{courseId}`:删除没有签到、请假或评价数据的独立课程。 - `DELETE /class/subject/admin/{courseId}`:删除没有签到、请假或评价数据的独立课程。
## 7. 导出课程表 ## 7. 导出课程表
`GET /class/subject/admin/classes/{classId}/export` `GET /class/subject/admin/classes/{classId}/export`
支持与列表相同的日期范围参数,返回带UTF-8 BOM的CSV。上午、下午课程按独立行输出,并包含 支持与列表相同的日期范围参数,返回带UTF-8 BOM的CSV。各课程按独立行输出,并包含
排课组ID和 `AM/PM/ALL_DAY` 期间,确保不同课程名或教师的信息不会在导出时丢失。 排课组ID和 `AM/PM/ALL_DAY` 期间,确保不同课程名或教师的信息不会在导出时丢失。
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
-- 设计说明: -- 设计说明:
-- 1. 项目已存在class_subject表,本脚本调整课时精度、补充排课组、审计列和常用索引。 -- 1. 项目已存在class_subject表,本脚本调整课时精度、补充排课组、审计列和常用索引。
-- 2. 旧数据允许审计时间为空;新增/编辑接口会自动维护create_time和update_time。 -- 2. 旧数据允许审计时间为空;新增/编辑接口会自动维护create_time和update_time。
-- 3. 上午、下午仍是独立class_subject记录,schedule_group_id只负责聚合页面中的同一排课行。 -- 3. 组内课程仍是独立class_subject记录,schedule_group_id只负责聚合页面中的同一排课行。
-- 4. 项目历史表主要由服务层维护关系完整性,本脚本不额外引入外键,避免阻断旧数据迁移。 -- 4. 项目历史表主要由服务层维护关系完整性,本脚本不额外引入外键,避免阻断旧数据迁移。
delimiter $$ delimiter $$
...@@ -24,7 +24,7 @@ begin ...@@ -24,7 +24,7 @@ begin
end if; end if;
-- --
-- 新版页面允许一行展示上午、下午两条独立课程。旧记录逐条分组,不按日期自动合并, -- 新版页面允许一行展示多条同日独立课程。旧记录逐条分组,不按日期自动合并,
-- 可以避免把历史上同日但业务含义不同的课程错误组合到同一编辑单元。 -- 可以避免把历史上同日但业务含义不同的课程错误组合到同一编辑单元。
-- --
if not exists ( if not exists (
......
package com.platform.business.service.impl; package com.platform.business.service.impl;
import com.platform.business.constant.ClassAdminConstants;
import com.platform.business.mapper.ClassMapper; import com.platform.business.mapper.ClassMapper;
import com.platform.business.mapper.ClassSubjectMapper; import com.platform.business.mapper.ClassSubjectMapper;
import com.platform.business.model.dto.CourseAdminBatchSaveDTO; import com.platform.business.model.dto.CourseAdminBatchSaveDTO;
...@@ -22,6 +23,9 @@ import org.mockito.junit.jupiter.MockitoExtension; ...@@ -22,6 +23,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Date; import java.sql.Date;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -65,7 +69,7 @@ class CourseAdminServiceImplTest { ...@@ -65,7 +69,7 @@ class CourseAdminServiceImplTest {
mockEmptyDetail(); mockEmptyDetail();
CourseAdminSaveDTO item = validCourse(); CourseAdminSaveDTO item = validCourse();
item.setTimeFrames(Arrays.asList("10:40→12:00", "9:00—10:20")); item.setTimeFrames(Arrays.asList("14:00→15:00", "9:00—10:20"));
item.setSubjectHour(new BigDecimal("1.5")); item.setSubjectHour(new BigDecimal("1.5"));
CourseAdminBatchSaveDTO request = new CourseAdminBatchSaveDTO(); CourseAdminBatchSaveDTO request = new CourseAdminBatchSaveDTO();
request.setClassId(1); request.setClassId(1);
...@@ -76,7 +80,7 @@ class CourseAdminServiceImplTest { ...@@ -76,7 +80,7 @@ class CourseAdminServiceImplTest {
ArgumentCaptor<ClassSubjectEntity> captor = ArgumentCaptor<ClassSubjectEntity> captor =
ArgumentCaptor.forClass(ClassSubjectEntity.class); ArgumentCaptor.forClass(ClassSubjectEntity.class);
verify(classSubjectMapper).insert(captor.capture()); verify(classSubjectMapper).insert(captor.capture());
assertEquals("09:00-10:20,10:40-12:00", captor.getValue().getTimeFrame()); assertEquals("09:00-10:20,14:00-15:00", captor.getValue().getTimeFrame());
assertEquals("周二", captor.getValue().getWeek()); assertEquals("周二", captor.getValue().getWeek());
assertEquals(new BigDecimal("1.5"), captor.getValue().getSubjectHour()); assertEquals(new BigDecimal("1.5"), captor.getValue().getSubjectHour());
assertEquals("测试课程", captor.getValue().getSubjectName()); assertEquals("测试课程", captor.getValue().getSubjectName());
...@@ -85,7 +89,7 @@ class CourseAdminServiceImplTest { ...@@ -85,7 +89,7 @@ class CourseAdminServiceImplTest {
} }
@Test @Test
void createBatchShouldGroupMorningAndAfternoonOfSameDate() { void createBatchShouldAllowAdjacentCoursesOnSameDate() {
mockWritableClass(); mockWritableClass();
when(classSubjectMapper.countAdminActiveTeacher(any())).thenReturn(1); when(classSubjectMapper.countAdminActiveTeacher(any())).thenReturn(1);
when(classSubjectMapper.selectAdminConflictCandidates(any(), eq(1), when(classSubjectMapper.selectAdminConflictCandidates(any(), eq(1),
...@@ -93,17 +97,18 @@ class CourseAdminServiceImplTest { ...@@ -93,17 +97,18 @@ class CourseAdminServiceImplTest {
when(classSubjectMapper.insert(any(ClassSubjectEntity.class))).thenReturn(1); when(classSubjectMapper.insert(any(ClassSubjectEntity.class))).thenReturn(1);
mockEmptyDetail(); mockEmptyDetail();
CourseAdminSaveDTO morning = validCourse(); CourseAdminSaveDTO first = validCourse();
morning.setType(null); first.setType(null);
CourseAdminSaveDTO afternoon = validCourse(); first.setTimeFrames(Collections.singletonList("09:00-10:00"));
afternoon.setTeacherId("teacher-2"); CourseAdminSaveDTO second = validCourse();
afternoon.setType(null); second.setTeacherId("teacher-2");
afternoon.setTimeFrames(Collections.singletonList("13:00-14:20")); second.setType(null);
second.setTimeFrames(Collections.singletonList("10:00-11:00"));
CourseAdminBatchSaveDTO request = new CourseAdminBatchSaveDTO(); CourseAdminBatchSaveDTO request = new CourseAdminBatchSaveDTO();
request.setClassId(1); request.setClassId(1);
request.setType("理论"); request.setType("理论");
request.setCourses(Arrays.asList(morning, afternoon)); request.setCourses(Arrays.asList(first, second));
service.createBatch(request); service.createBatch(request);
...@@ -117,20 +122,66 @@ class CourseAdminServiceImplTest { ...@@ -117,20 +122,66 @@ class CourseAdminServiceImplTest {
} }
@Test @Test
void createBatchShouldRejectTimeFramesCrossingNoon() { void createBatchShouldAllowSingleTimeFrameCrossingNoon() {
mockWritableClass(); mockWritableClass();
when(classSubjectMapper.countAdminActiveTeacher("teacher-1")).thenReturn(1); when(classSubjectMapper.countAdminActiveTeacher("teacher-1")).thenReturn(1);
when(classSubjectMapper.selectAdminConflictCandidates(any(), eq(1),
eq("teacher-1"), anyList())).thenReturn(Collections.emptyList());
when(classSubjectMapper.insert(any(ClassSubjectEntity.class))).thenReturn(1);
mockEmptyDetail();
CourseAdminSaveDTO item = validCourse(); CourseAdminSaveDTO item = validCourse();
item.setTimeFrames(Collections.singletonList("11:00-13:00")); item.setTimeFrames(Collections.singletonList("11:00-13:00"));
CourseAdminBatchSaveDTO request = new CourseAdminBatchSaveDTO(); CourseAdminBatchSaveDTO request = new CourseAdminBatchSaveDTO();
request.setClassId(1); request.setClassId(1);
request.setCourses(Collections.singletonList(item)); request.setCourses(Collections.singletonList(item));
service.createBatch(request);
ArgumentCaptor<ClassSubjectEntity> captor =
ArgumentCaptor.forClass(ClassSubjectEntity.class);
verify(classSubjectMapper).insert(captor.capture());
assertEquals("11:00-13:00", captor.getValue().getTimeFrame());
}
@Test
void createBatchShouldRejectOverlappingCoursesInSameRequest() {
mockWritableClass();
when(classSubjectMapper.countAdminActiveTeacher(any())).thenReturn(1);
when(classSubjectMapper.selectAdminConflictCandidates(any(), eq(1),
any(), anyList())).thenReturn(Collections.emptyList());
when(classSubjectMapper.insert(any(ClassSubjectEntity.class))).thenReturn(1);
CourseAdminSaveDTO first = validCourse();
first.setTimeFrames(Collections.singletonList("09:00-10:20"));
CourseAdminSaveDTO second = validCourse();
second.setTeacherId("teacher-2");
second.setTimeFrames(Collections.singletonList("10:00-11:00"));
CourseAdminBatchSaveDTO request = new CourseAdminBatchSaveDTO();
request.setClassId(1);
request.setCourses(Arrays.asList(first, second));
BusinessException error = assertThrows(BusinessException.class,
() -> service.createBatch(request));
assertEquals("第2节课程:与第1节课程时间冲突", error.getMessage());
// 第一条写入会由真实事务统一回滚;第二条必须在执行insert前被请求内校验拦截。
verify(classSubjectMapper).insert(any(ClassSubjectEntity.class));
}
@Test
void createBatchShouldRejectOverlappingFramesWithinOneCourse() {
mockWritableClass();
when(classSubjectMapper.countAdminActiveTeacher("teacher-1")).thenReturn(1);
CourseAdminSaveDTO item = validCourse();
item.setTimeFrames(Arrays.asList("09:00-10:20", "10:00-11:00"));
CourseAdminBatchSaveDTO request = new CourseAdminBatchSaveDTO();
request.setClassId(1);
request.setCourses(Collections.singletonList(item));
BusinessException error = assertThrows(BusinessException.class, BusinessException error = assertThrows(BusinessException.class,
() -> service.createBatch(request)); () -> service.createBatch(request));
assertEquals("第1节课程:同一行时间段不能同时跨上午和下午,请拆成两行提交", assertEquals("第1节课程:同一课程内的上课时段不能重叠", error.getMessage());
error.getMessage());
verify(classSubjectMapper, never()).insert(any(ClassSubjectEntity.class)); verify(classSubjectMapper, never()).insert(any(ClassSubjectEntity.class));
} }
...@@ -187,6 +238,32 @@ class CourseAdminServiceImplTest { ...@@ -187,6 +238,32 @@ class CourseAdminServiceImplTest {
verify(classSubjectMapper, never()).updateAdminCourse(any(ClassSubjectEntity.class)); verify(classSubjectMapper, never()).updateAdminCourse(any(ClassSubjectEntity.class));
} }
@Test
void updateShouldAllowCourseCrossingNoon() {
ClassSubjectEntity existing = existingCourse(7, "group-1", "09:00-10:20");
when(classSubjectMapper.selectById(7)).thenReturn(existing);
mockWritableClass();
when(classSubjectMapper.countAdminActiveTeacher("teacher-1")).thenReturn(1);
when(classSubjectMapper.selectAdminConflictCandidates(any(), eq(1),
eq("teacher-1"), anyList())).thenReturn(Collections.emptyList());
when(classSubjectMapper.updateAdminCourse(any(ClassSubjectEntity.class))).thenReturn(1);
CourseAdminScheduleVO refreshed = new CourseAdminScheduleVO();
refreshed.setId(7);
refreshed.setTimeFrame("11:00-13:00");
when(classSubjectMapper.selectAdminCourseById(7)).thenReturn(refreshed);
CourseAdminSaveDTO request = validCourse();
request.setTimeFrames(Collections.singletonList("11:00-13:00"));
CourseAdminScheduleVO result = service.update(7, request);
ArgumentCaptor<ClassSubjectEntity> captor =
ArgumentCaptor.forClass(ClassSubjectEntity.class);
verify(classSubjectMapper).updateAdminCourse(captor.capture());
assertEquals("11:00-13:00", captor.getValue().getTimeFrame());
assertEquals("ALL_DAY", result.getPeriod());
}
@Test @Test
void detailShouldReturnStructuredFramesAndExactTotalHours() { void detailShouldReturnStructuredFramesAndExactTotalHours() {
CourseAdminDetailVO detail = new CourseAdminDetailVO(); CourseAdminDetailVO detail = new CourseAdminDetailVO();
...@@ -201,7 +278,7 @@ class CourseAdminServiceImplTest { ...@@ -201,7 +278,7 @@ class CourseAdminServiceImplTest {
first.setDate(Date.valueOf("2026-09-08")); first.setDate(Date.valueOf("2026-09-08"));
first.setWeek("周二"); first.setWeek("周二");
first.setSubjectTimes(2); first.setSubjectTimes(2);
first.setTimeFrame("09:00-10:20,10:40-12:00"); first.setTimeFrame("09:00-10:20,14:00-15:00");
first.setSubjectHour(new BigDecimal("1.5")); first.setSubjectHour(new BigDecimal("1.5"));
CourseAdminScheduleVO second = new CourseAdminScheduleVO(); CourseAdminScheduleVO second = new CourseAdminScheduleVO();
second.setId(2); second.setId(2);
...@@ -219,16 +296,16 @@ class CourseAdminServiceImplTest { ...@@ -219,16 +296,16 @@ class CourseAdminServiceImplTest {
assertEquals(2, result.getCourseCount()); assertEquals(2, result.getCourseCount());
assertEquals(new BigDecimal("3.5"), result.getTotalHours()); assertEquals(new BigDecimal("3.5"), result.getTotalHours());
assertEquals(Arrays.asList("09:00-10:20", "10:40-12:00"), assertEquals(Arrays.asList("09:00-10:20", "14:00-15:00"),
result.getCourses().get(0).getTimeFrames()); result.getCourses().get(0).getTimeFrames());
assertEquals(1, result.getScheduleCount()); assertEquals(1, result.getScheduleCount());
assertEquals(3, result.getSchedules().get(0).getSubjectTimes()); assertEquals(3, result.getSchedules().get(0).getSubjectTimes());
assertEquals("AM", result.getSchedules().get(0).getItems().get(0).getPeriod()); assertEquals("ALL_DAY", result.getSchedules().get(0).getItems().get(0).getPeriod());
assertEquals("PM", result.getSchedules().get(0).getItems().get(1).getPeriod()); assertEquals("PM", result.getSchedules().get(0).getItems().get(1).getPeriod());
} }
@Test @Test
void updateScheduleShouldKeepExistingIdAndInsertMissingPeriod() { void updateScheduleShouldAllowThreeNonOverlappingCoursesIncludingAllDay() {
ClassSubjectEntity existing = existingCourse(11, "group-1", "09:00-10:20"); ClassSubjectEntity existing = existingCourse(11, "group-1", "09:00-10:20");
when(classSubjectMapper.selectAdminCourseGroupEntities("group-1")) when(classSubjectMapper.selectAdminCourseGroupEntities("group-1"))
.thenReturn(Collections.singletonList(existing)); .thenReturn(Collections.singletonList(existing));
...@@ -240,11 +317,14 @@ class CourseAdminServiceImplTest { ...@@ -240,11 +317,14 @@ class CourseAdminServiceImplTest {
when(classSubjectMapper.insert(any(ClassSubjectEntity.class))).thenReturn(1); when(classSubjectMapper.insert(any(ClassSubjectEntity.class))).thenReturn(1);
mockGroupDetail("group-1"); mockGroupDetail("group-1");
CourseAdminScheduleItemSaveDTO morning = scheduleItem(11, "teacher-1", "09:00-10:20"); CourseAdminScheduleItemSaveDTO morning = scheduleItem(11, "teacher-1", "09:00-10:00");
CourseAdminScheduleItemSaveDTO afternoon = scheduleItem(null, "teacher-2", "13:00-14:20"); CourseAdminScheduleItemSaveDTO crossingNoon =
scheduleItem(null, "teacher-2", "11:00-13:00");
CourseAdminScheduleItemSaveDTO afternoon =
scheduleItem(null, "teacher-3", "14:00-15:00");
CourseAdminScheduleGroupSaveDTO request = new CourseAdminScheduleGroupSaveDTO(); CourseAdminScheduleGroupSaveDTO request = new CourseAdminScheduleGroupSaveDTO();
request.setDate(Date.valueOf("2026-09-08")); request.setDate(testCourseDate());
request.setCourses(Arrays.asList(morning, afternoon)); request.setCourses(Arrays.asList(morning, crossingNoon, afternoon));
CourseAdminScheduleGroupVO result = service.updateSchedule("group-1", request); CourseAdminScheduleGroupVO result = service.updateSchedule("group-1", request);
...@@ -253,10 +333,35 @@ class CourseAdminServiceImplTest { ...@@ -253,10 +333,35 @@ class CourseAdminServiceImplTest {
verify(classSubjectMapper).updateAdminCourse(updateCaptor.capture()); verify(classSubjectMapper).updateAdminCourse(updateCaptor.capture());
assertEquals(11, updateCaptor.getValue().getId()); assertEquals(11, updateCaptor.getValue().getId());
assertEquals("group-1", updateCaptor.getValue().getScheduleGroupId()); assertEquals("group-1", updateCaptor.getValue().getScheduleGroupId());
verify(classSubjectMapper).insert(any(ClassSubjectEntity.class)); verify(classSubjectMapper, org.mockito.Mockito.times(2))
.insert(any(ClassSubjectEntity.class));
assertEquals("group-1", result.getScheduleGroupId()); assertEquals("group-1", result.getScheduleGroupId());
} }
@Test
void updateScheduleShouldRejectOverlappingCoursesInSameRequest() {
ClassSubjectEntity existing = existingCourse(11, "group-1", "09:00-10:20");
when(classSubjectMapper.selectAdminCourseGroupEntities("group-1"))
.thenReturn(Collections.singletonList(existing));
mockWritableClass();
when(classSubjectMapper.countAdminActiveTeacher(any())).thenReturn(1);
CourseAdminScheduleItemSaveDTO first =
scheduleItem(11, "teacher-1", "09:00-10:20");
CourseAdminScheduleItemSaveDTO second =
scheduleItem(null, "teacher-2", "10:00-11:00");
CourseAdminScheduleGroupSaveDTO request = new CourseAdminScheduleGroupSaveDTO();
request.setDate(testCourseDate());
request.setCourses(Arrays.asList(first, second));
BusinessException error = assertThrows(BusinessException.class,
() -> service.updateSchedule("group-1", request));
assertEquals("第2节课程:与第1节课程时间冲突", error.getMessage());
verify(classSubjectMapper, never()).updateAdminCourse(any(ClassSubjectEntity.class));
verify(classSubjectMapper, never()).insert(any(ClassSubjectEntity.class));
}
@Test @Test
void updateScheduleShouldRejectChangingReferencedCourse() { void updateScheduleShouldRejectChangingReferencedCourse() {
ClassSubjectEntity existing = existingCourse(11, "group-1", "09:00-10:20"); ClassSubjectEntity existing = existingCourse(11, "group-1", "09:00-10:20");
...@@ -268,7 +373,7 @@ class CourseAdminServiceImplTest { ...@@ -268,7 +373,7 @@ class CourseAdminServiceImplTest {
CourseAdminScheduleItemSaveDTO changed = scheduleItem(11, "teacher-2", "09:00-10:20"); CourseAdminScheduleItemSaveDTO changed = scheduleItem(11, "teacher-2", "09:00-10:20");
CourseAdminScheduleGroupSaveDTO request = new CourseAdminScheduleGroupSaveDTO(); CourseAdminScheduleGroupSaveDTO request = new CourseAdminScheduleGroupSaveDTO();
request.setDate(Date.valueOf("2026-09-08")); request.setDate(testCourseDate());
request.setCourses(Collections.singletonList(changed)); request.setCourses(Collections.singletonList(changed));
BusinessException error = assertThrows(BusinessException.class, BusinessException error = assertThrows(BusinessException.class,
...@@ -282,8 +387,9 @@ class CourseAdminServiceImplTest { ...@@ -282,8 +387,9 @@ class CourseAdminServiceImplTest {
when(classSubjectMapper.lockAdminCourseClass(1)).thenReturn(1); when(classSubjectMapper.lockAdminCourseClass(1)).thenReturn(1);
ClassEntity managedClass = new ClassEntity(); ClassEntity managedClass = new ClassEntity();
managedClass.setId(1); managedClass.setId(1);
managedClass.setStartDate(Date.valueOf("2026-09-01")); LocalDate courseDate = testCourseDate().toLocalDate();
managedClass.setEndDate(Date.valueOf("2026-12-31")); managedClass.setStartDate(Date.valueOf(courseDate.minusDays(1)));
managedClass.setEndDate(Date.valueOf(courseDate.plusMonths(1)));
when(classMapper.selectById(1)).thenReturn(managedClass); when(classMapper.selectById(1)).thenReturn(managedClass);
} }
...@@ -298,7 +404,7 @@ class CourseAdminServiceImplTest { ...@@ -298,7 +404,7 @@ class CourseAdminServiceImplTest {
private CourseAdminSaveDTO validCourse() { private CourseAdminSaveDTO validCourse() {
CourseAdminSaveDTO request = new CourseAdminSaveDTO(); CourseAdminSaveDTO request = new CourseAdminSaveDTO();
request.setDate(Date.valueOf("2026-09-08")); request.setDate(testCourseDate());
request.setSubjectTimes(2); request.setSubjectTimes(2);
request.setTimeFrames(Collections.singletonList("09:00-10:20")); request.setTimeFrames(Collections.singletonList("09:00-10:20"));
request.setSubjectHour(new BigDecimal("1.0")); request.setSubjectHour(new BigDecimal("1.0"));
...@@ -313,7 +419,7 @@ class CourseAdminServiceImplTest { ...@@ -313,7 +419,7 @@ class CourseAdminServiceImplTest {
entity.setId(id); entity.setId(id);
entity.setClassId(1); entity.setClassId(1);
entity.setScheduleGroupId(groupId); entity.setScheduleGroupId(groupId);
entity.setDate(Date.valueOf("2026-09-08")); entity.setDate(testCourseDate());
entity.setWeek("周二"); entity.setWeek("周二");
entity.setSubjectTimes(2); entity.setSubjectTimes(2);
entity.setTimeFrame(timeFrame); entity.setTimeFrame(timeFrame);
...@@ -346,17 +452,26 @@ class CourseAdminServiceImplTest { ...@@ -346,17 +452,26 @@ class CourseAdminServiceImplTest {
morning.setId(11); morning.setId(11);
morning.setClassId(1); morning.setClassId(1);
morning.setScheduleGroupId(groupId); morning.setScheduleGroupId(groupId);
morning.setDate(Date.valueOf("2026-09-08")); morning.setDate(testCourseDate());
morning.setTimeFrame("09:00-10:20"); morning.setTimeFrame("09:00-10:20");
morning.setSubjectHour(new BigDecimal("1.0")); morning.setSubjectHour(new BigDecimal("1.0"));
CourseAdminScheduleVO afternoon = new CourseAdminScheduleVO(); CourseAdminScheduleVO afternoon = new CourseAdminScheduleVO();
afternoon.setId(12); afternoon.setId(12);
afternoon.setClassId(1); afternoon.setClassId(1);
afternoon.setScheduleGroupId(groupId); afternoon.setScheduleGroupId(groupId);
afternoon.setDate(Date.valueOf("2026-09-08")); afternoon.setDate(testCourseDate());
afternoon.setTimeFrame("13:00-14:20"); afternoon.setTimeFrame("13:00-14:20");
afternoon.setSubjectHour(new BigDecimal("1.0")); afternoon.setSubjectHour(new BigDecimal("1.0"));
when(classSubjectMapper.selectAdminCourseList(1, null, null)) when(classSubjectMapper.selectAdminCourseList(1, null, null))
.thenReturn(Arrays.asList(morning, afternoon)); .thenReturn(Arrays.asList(morning, afternoon));
} }
/**
* 始终取业务时区中的下一个周二,既保证新增日期位于未来,又保留星期断言的确定性。
*/
private Date testCourseDate() {
LocalDate nextTuesday = LocalDate.now(ClassAdminConstants.BUSINESS_ZONE)
.with(TemporalAdjusters.next(DayOfWeek.TUESDAY));
return Date.valueOf(nextTuesday);
}
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment