diff --git a/README.md b/README.md index 6d81e5c..37859c4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 面向普通高校的教务管理系统。后端使用 ASP.NET Core 10、EF Core 10，前端使用 Vue 3、TypeScript 和 Element Plus。 -当前已实现系统登录与角色权限、基础数据、用户管理、教师档案、学生档案、课程库、培养方案、教学任务、排课课表、学生选课、成绩管理、考试考场、学籍异动、毕业审核、学位授予、毕业离校和首页统计。人员及课程列表支持组合筛选、服务端分页和完整增删改查；培养方案支持课程模块、专业年级版本、复制新版本、发布锁定和旧版本归档；教学任务支持学期课程开设、多教师、合班、容量校验、发布与结课，公共课由校级教务负责、专业必修/专业选修/实践课下放课程所属学院管理，并支持教师按学期申报授课科目、学院审核授课资格、公共课按若干行政班合并教学班，以及在审核通过的教师池中随机均衡分配后批量生成草稿；排课支持学期作息维护、单双周与周次节次、课程可用时间、校区/教学楼/指定教室约束、不占用教室课程、教室容量、教师/行政班/教室冲突校验、自动生成、手工微调和版本化发布；选课支持批次时间窗、投放范围、容量与学分上限、重复课程与课表冲突校验、退课截止时间和实时教学班名单；成绩管理支持分项比例、批量录入、特殊考试状态、自动总评与绩点、教师提交、学院审核、校级发布和学生成绩单；考试管理支持考试计划、场次、考场容量、监考教师、考生名单以及考场/监考/学生时间冲突校验；学籍异动支持休学、复学、退学申请，辅导员、学院、学校三级顺序审核，学生撤回，以及最终审批后自动同步学籍状态；毕业审核按入学年级匹配已发布培养方案，以正式成绩计算总学分、必修通过和未解决不及格课程，支持学院范围查看、人工复核、校级锁定发布和学生结果查询；学位授予以已发布毕业资格为来源，按正式成绩加权平均绩点生成规则结论，支持学院人工复核、校级发布锁定和学生结果查询；毕业离校支持自定义事项与责任部门，按校级、学院、辅导员角色分工办理，强制数据范围校验，学生进度查询，以及必办事项全部完成后的批次锁定。 +当前已实现系统登录与角色权限、基础数据、用户管理、教师档案、学生档案、课程库、培养方案、教学任务、排课课表、学生选课、成绩管理、考试考场、学籍异动、毕业审核、学位授予、毕业离校和首页统计。人员及课程列表支持组合筛选、服务端分页和完整增删改查；培养方案支持课程模块、专业年级版本、复制新版本、发布与旧版本归档，已发布版本可继续维护名称、学分说明和课程结构，适用专业、入学年级及版本号保持锁定；教学任务支持学期课程开设、多教师、合班、容量校验、发布与结课，公共课由校级教务负责、专业必修/专业选修/实践课下放课程所属学院管理，并支持教师按学期申报授课科目、学院审核授课资格、公共课按若干行政班合并教学班，以及在审核通过的教师池中随机均衡分配后批量生成草稿；排课支持学期作息维护、单双周与周次节次、课程可用时间、校区/教学楼/指定教室约束、不占用教室课程、教室容量、教师/行政班/教室冲突校验、自动生成、手工微调和版本化发布；选课支持批次时间窗、投放范围、容量与学分上限、重复课程与课表冲突校验、退课截止时间和实时教学班名单；成绩管理支持分项比例、批量录入、特殊考试状态、自动总评与绩点、教师提交、学院审核、校级发布和学生成绩单；考试管理支持考试计划、场次、考场容量、监考教师、考生名单以及考场/监考/学生时间冲突校验；学籍异动支持休学、复学、退学申请，辅导员、学院、学校三级顺序审核，学生撤回，以及最终审批后自动同步学籍状态；毕业审核按入学年级匹配已发布培养方案，以正式成绩计算总学分、必修通过和未解决不及格课程，支持学院范围查看、人工复核、校级锁定发布和学生结果查询；学位授予以已发布毕业资格为来源，按正式成绩加权平均绩点生成规则结论，支持学院人工复核、校级发布锁定和学生结果查询；毕业离校支持自定义事项与责任部门，按校级、学院、辅导员角色分工办理，强制数据范围校验，学生进度查询，以及必办事项全部完成后的批次锁定。 课程库支持下载标准模板后批量导入 `.xlsx`，按课程编码新增或更新，并在整批校验失败时不写入任何课程；授课资格既支持教师申报后审核，也支持学院在本院教师范围内直接分配；学生可在“我的培养方案”中查看本人适用的已发布方案，并按已完成、在读、重修中、未通过、待完成和未修读状态核对课程与学分进度。 diff --git a/src/Jiaowu.Api/Controllers/CurriculumPlansController.cs b/src/Jiaowu.Api/Controllers/CurriculumPlansController.cs index 3e60a50..513ff80 100644 --- a/src/Jiaowu.Api/Controllers/CurriculumPlansController.cs +++ b/src/Jiaowu.Api/Controllers/CurriculumPlansController.cs @@ -3,6 +3,7 @@ using Jiaowu.Api.Contracts; using Jiaowu.Api.Domain.Academic; using Jiaowu.Api.Domain.Identity; using Jiaowu.Api.Infrastructure.Auth; +using Jiaowu.Api.Infrastructure.Graduation; using Jiaowu.Api.Infrastructure.Persistence; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -211,8 +212,16 @@ public sealed class CurriculumPlansController( { var plan = await EditablePlanAsync(id, cancellationToken); if (plan is null) return NotFound(); - if (plan.Status != CurriculumPlanStatus.Draft) - return ConflictProblem("已发布或已归档的培养方案不可直接修改，请复制为新版本。"); + if (!CurriculumPlanEditingPolicy.CanModifyContent(plan.Status)) + return ConflictProblem("已归档的培养方案不可修改。"); + if (!CurriculumPlanEditingPolicy.CanChangeApplicability(plan.Status) && + (plan.MajorId != request.MajorId || + plan.EffectiveGrade != request.EffectiveGrade || + !string.Equals(plan.Version, request.Version.Trim(), StringComparison.Ordinal))) + { + return ConflictProblem( + "已发布方案可以修改名称、学分说明和课程结构；如需变更适用专业、入学年级或版本号，请复制为新版本。"); + } var major = await FindAccessibleMajorAsync(request.MajorId, cancellationToken); if (major is null) return ValidationProblem("所选专业不存在或不在当前数据范围内。"); @@ -327,7 +336,7 @@ public sealed class CurriculumPlansController( CurriculumModuleRequest request, CancellationToken cancellationToken) { - var plan = await DraftPlanAsync(planId, cancellationToken); + var plan = await ModifiablePlanAsync(planId, cancellationToken); if (plan is null) return NotFound(); var module = new CurriculumModule { @@ -348,7 +357,7 @@ public sealed class CurriculumPlansController( CurriculumModuleRequest request, CancellationToken cancellationToken) { - if (await DraftPlanAsync(planId, cancellationToken) is null) return NotFound(); + if (await ModifiablePlanAsync(planId, cancellationToken) is null) return NotFound(); var module = await db.CurriculumModules .FirstOrDefaultAsync(x => x.Id == moduleId && x.CurriculumPlanId == planId, cancellationToken); if (module is null) return NotFound(); @@ -365,7 +374,7 @@ public sealed class CurriculumPlansController( Guid moduleId, CancellationToken cancellationToken) { - if (await DraftPlanAsync(planId, cancellationToken) is null) return NotFound(); + if (await ModifiablePlanAsync(planId, cancellationToken) is null) return NotFound(); var module = await db.CurriculumModules .FirstOrDefaultAsync(x => x.Id == moduleId && x.CurriculumPlanId == planId, cancellationToken); if (module is null) return NotFound(); @@ -380,7 +389,7 @@ public sealed class CurriculumPlansController( CurriculumCourseRequest request, CancellationToken cancellationToken) { - var plan = await DraftPlanAsync(planId, cancellationToken); + var plan = await ModifiablePlanAsync(planId, cancellationToken); if (plan is null) return NotFound(); if (!await db.CurriculumModules.AnyAsync( x => x.Id == moduleId && x.CurriculumPlanId == planId, @@ -418,7 +427,7 @@ public sealed class CurriculumPlansController( CurriculumCourseRequest request, CancellationToken cancellationToken) { - var plan = await DraftPlanAsync(planId, cancellationToken); + var plan = await ModifiablePlanAsync(planId, cancellationToken); if (plan is null) return NotFound(); var item = await db.CurriculumCourses .FirstOrDefaultAsync(x => @@ -454,7 +463,7 @@ public sealed class CurriculumPlansController( Guid itemId, CancellationToken cancellationToken) { - if (await DraftPlanAsync(planId, cancellationToken) is null) return NotFound(); + if (await ModifiablePlanAsync(planId, cancellationToken) is null) return NotFound(); var item = await db.CurriculumCourses .FirstOrDefaultAsync(x => x.Id == itemId && @@ -488,13 +497,15 @@ public sealed class CurriculumPlansController( CancellationToken cancellationToken) => await ScopedPlans().FirstOrDefaultAsync(x => x.Id == id, cancellationToken); - private async Task DraftPlanAsync( + private async Task ModifiablePlanAsync( Guid id, CancellationToken cancellationToken) => await ScopedPlans() .Include(x => x.Major) .FirstOrDefaultAsync( - x => x.Id == id && x.Status == CurriculumPlanStatus.Draft, + x => x.Id == id && + (x.Status == CurriculumPlanStatus.Draft || + x.Status == CurriculumPlanStatus.Published), cancellationToken); private Guid? ScopedCollegeId() diff --git a/src/Jiaowu.Api/Infrastructure/Graduation/CurriculumPlanEditingPolicy.cs b/src/Jiaowu.Api/Infrastructure/Graduation/CurriculumPlanEditingPolicy.cs new file mode 100644 index 0000000..ee8ccf6 --- /dev/null +++ b/src/Jiaowu.Api/Infrastructure/Graduation/CurriculumPlanEditingPolicy.cs @@ -0,0 +1,12 @@ +using Jiaowu.Api.Domain.Academic; + +namespace Jiaowu.Api.Infrastructure.Graduation; + +public static class CurriculumPlanEditingPolicy +{ + public static bool CanModifyContent(CurriculumPlanStatus status) => + status is CurriculumPlanStatus.Draft or CurriculumPlanStatus.Published; + + public static bool CanChangeApplicability(CurriculumPlanStatus status) => + status == CurriculumPlanStatus.Draft; +} diff --git a/tests/Jiaowu.Api.Tests/CurriculumPlanEditingPolicyTests.cs b/tests/Jiaowu.Api.Tests/CurriculumPlanEditingPolicyTests.cs new file mode 100644 index 0000000..c9a6cc7 --- /dev/null +++ b/tests/Jiaowu.Api.Tests/CurriculumPlanEditingPolicyTests.cs @@ -0,0 +1,29 @@ +using Jiaowu.Api.Domain.Academic; +using Jiaowu.Api.Infrastructure.Graduation; + +namespace Jiaowu.Api.Tests; + +public sealed class CurriculumPlanEditingPolicyTests +{ + [Theory] + [InlineData(CurriculumPlanStatus.Draft, true)] + [InlineData(CurriculumPlanStatus.Published, true)] + [InlineData(CurriculumPlanStatus.Archived, false)] + public void Content_modification_is_limited_to_draft_and_published_plans( + CurriculumPlanStatus status, + bool expected) + { + Assert.Equal(expected, CurriculumPlanEditingPolicy.CanModifyContent(status)); + } + + [Theory] + [InlineData(CurriculumPlanStatus.Draft, true)] + [InlineData(CurriculumPlanStatus.Published, false)] + [InlineData(CurriculumPlanStatus.Archived, false)] + public void Only_draft_plans_can_change_their_applicability( + CurriculumPlanStatus status, + bool expected) + { + Assert.Equal(expected, CurriculumPlanEditingPolicy.CanChangeApplicability(status)); + } +} diff --git a/web/src/style.css b/web/src/style.css index 97dfb09..4038bde 100644 --- a/web/src/style.css +++ b/web/src/style.css @@ -276,6 +276,7 @@ button { cursor: pointer; } .plan-detail-head p { margin: 0; color: var(--muted); font-size: 11px; } .plan-actions { display: flex; flex-wrap: wrap; align-content: flex-start; justify-content: flex-end; gap: 7px; } .plan-actions .el-button + .el-button { margin-left: 0; } +.published-edit-notice { margin-top: 16px; border-radius: 0; } .plan-metrics { margin: 18px 0; display: grid; grid-template-columns: repeat(4, 1fr); border: 1px solid var(--line); } .plan-metrics > div { padding: 15px 17px; border-right: 1px solid var(--line); } .plan-metrics > div:last-child { border-right: none; } diff --git a/web/src/views/CurriculumView.vue b/web/src/views/CurriculumView.vue index 781dbcf..fcdcd1e 100644 --- a/web/src/views/CurriculumView.vue +++ b/web/src/views/CurriculumView.vue @@ -19,6 +19,7 @@ const moduleDialog = ref(false) const courseDialog = ref(false) const cloneDialog = ref(false) const editingPlanId = ref('') +const editingPlanStatus = ref('') const editingModuleId = ref('') const editingCourseId = ref('') const activeModuleId = ref('') @@ -64,6 +65,9 @@ const maintenanceScope = computed(() => : '全校各学院', ) const isDraft = computed(() => selected.value?.status === 'Draft') +const isPublished = computed(() => selected.value?.status === 'Published') +const canEdit = computed(() => isDraft.value || isPublished.value) +const isEditingPublished = computed(() => editingPlanStatus.value === 'Published') const configuredCredits = computed(() => selected.value?.modules.reduce( (sum: number, module: any) => sum + Number(module.requiredCredits), @@ -129,6 +133,7 @@ function changeCollege() { function openPlan(row?: any) { editingPlanId.value = row?.id ?? '' + editingPlanStatus.value = row?.status ?? '' Object.keys(planForm).forEach((key) => delete planForm[key]) Object.assign(planForm, { majorId: row?.majorId, @@ -141,11 +146,30 @@ function openPlan(row?: any) { planDialog.value = true } +async function confirmPublishedChange(action: string) { + if (!isPublished.value) return true + try { + await ElMessageBox.confirm( + `${action}保存后会立即影响学生端培养方案展示及毕业审核依据。确定继续吗？`, + '修改已发布方案', + { + type: 'warning', + confirmButtonText: '确认修改', + cancelButtonText: '取消', + }, + ) + return true + } catch { + return false + } +} + async function savePlan() { if (!planForm.majorId || !planForm.name?.trim() || !planForm.version?.trim()) { ElMessage.warning('请填写专业、方案名称和版本号。') return } + if (editingPlanId.value && !await confirmPublishedChange('方案信息')) return try { if (editingPlanId.value) { await http.put(`/curriculum-plans/${editingPlanId.value}`, planForm) @@ -183,7 +207,7 @@ async function clonePlan() { async function publishPlan() { try { await ElMessageBox.confirm( - '发布后该版本将锁定，并自动归档同专业、同年级的旧发布版本。确定发布吗？', + '发布后该版本将成为学生端展示和毕业审核依据，并自动归档同专业、同年级的旧发布版本。已发布方案仍可调整课程内容，但适用专业、年级和版本号不可更改。确定发布吗？', '发布培养方案', { type: 'warning', confirmButtonText: '确认发布', cancelButtonText: '取消' }, ) @@ -226,6 +250,7 @@ async function saveModule() { ElMessage.warning('请填写模块编码和名称。') return } + if (!await confirmPublishedChange('课程模块')) return try { const base = `/curriculum-plans/${selected.value.id}/modules` if (editingModuleId.value) await http.put(`${base}/${editingModuleId.value}`, moduleForm) @@ -239,7 +264,10 @@ async function saveModule() { async function deleteModule(module: any) { try { - await ElMessageBox.confirm(`删除“${module.name}”及其中课程？`, '删除课程模块', { + const impact = isPublished.value + ? '删除后会立即影响学生端展示及毕业审核。' + : '' + await ElMessageBox.confirm(`删除“${module.name}”及其中课程？${impact}`, '删除课程模块', { type: 'warning', }) await http.delete(`/curriculum-plans/${selected.value.id}/modules/${module.id}`) @@ -266,6 +294,7 @@ async function saveCourse() { ElMessage.warning('请选择课程。') return } + if (!await confirmPublishedChange('方案课程')) return try { const base = `/curriculum-plans/${selected.value.id}/modules/${activeModuleId.value}/courses` if (editingCourseId.value) await http.put(`${base}/${editingCourseId.value}`, courseForm) @@ -279,7 +308,10 @@ async function saveCourse() { async function deleteCourse(moduleId: string, item: any) { try { - await ElMessageBox.confirm(`从方案中移除“${item.courseName}”？`, '移除课程', { + const impact = isPublished.value + ? '移除后会立即影响学生端展示及毕业审核。' + : '' + await ElMessageBox.confirm(`从方案中移除“${item.courseName}”？${impact}`, '移除课程', { type: 'warning', }) await http.delete( @@ -313,7 +345,7 @@ onMounted(async () => {
PROGRAMME OF STUDY

培养方案

-

由学院按专业和入学年级维护课程结构，发布后锁定，避免影响历史年级。

+

由学院按专业和入学年级维护课程结构；已发布方案可受控调整，修改结果即时生效。

新建方案 @@ -329,8 +361,8 @@ onMounted(async () => {

{{ isCollegeAdmin - ? '可新建、编制并发布本学院各专业培养方案' - : '可跨学院查看、维护并统筹培养方案版本' }} + ? '可新建、编制、发布并维护本学院各专业培养方案' + : '可跨学院查看、发布并统筹维护培养方案版本' }}

@@ -393,13 +425,22 @@ onMounted(async () => {

{{ selected.version }} · 适用 {{ selected.effectiveGrade }} 级 · {{ selected.schoolingYears }} 年制

- 编辑 + 编辑 复制版本 发布 删除
+ +
方案状态{{ statusLabels[selected.status] }}
总学分要求{{ selected.totalCredits }}
@@ -412,7 +453,7 @@ onMounted(async () => { 课程结构 指定必修须逐门通过；英语、体育等多选课程用“组内选修”，修满模块最低学分即可
- 新增模块 + 新增模块
@@ -427,7 +468,7 @@ onMounted(async () => { · 课程组选项

-
+
编辑 删除 添加课程 @@ -449,7 +490,7 @@ onMounted(async () => { - +