diff --git a/reading-platform-frontend/src/api/teacher.ts b/reading-platform-frontend/src/api/teacher.ts index 1ac45db..b027cff 100644 --- a/reading-platform-frontend/src/api/teacher.ts +++ b/reading-platform-frontend/src/api/teacher.ts @@ -819,9 +819,9 @@ export interface CreateTaskFromTemplateDto { } export const getTaskTemplates = (params?: { pageNum?: number; pageSize?: number }) => - http.get<{ records: any[]; total: number }>('/v1/teacher/task-templates', { params }) + http.get<{ list: any[]; total: number }>('/v1/teacher/task-templates', { params }) .then(res => ({ - items: res.records || [], + items: res.list || [], total: res.total || 0, })); diff --git a/reading-platform-frontend/src/views/teacher/tasks/TaskListView.vue b/reading-platform-frontend/src/views/teacher/tasks/TaskListView.vue index 7035111..5c01335 100644 --- a/reading-platform-frontend/src/views/teacher/tasks/TaskListView.vue +++ b/reading-platform-frontend/src/views/teacher/tasks/TaskListView.vue @@ -2,7 +2,9 @@
-

阅读任务

+

+ 阅读任务 +

管理班级阅读任务，跟踪学生完成情况

@@ -44,35 +46,20 @@
- + 进行中 草稿 已归档 - + 阅读 活动 作业 - +
@@ -105,12 +92,8 @@
- + {{ getCompletedCount(task) }}/{{ task.targetCount || 0 }} 人完成
@@ -154,34 +137,18 @@
- +
- + - + {{ tpl.name }} @@ -216,77 +183,44 @@ - + {{ cls.name }} ({{ cls.grade }}) - + {{ student.name }} - {{ student.class?.name }} - + {{ course.name }} - + - + - +
- + 待提交 已提交 已评价 @@ -308,7 +242,9 @@
{{ completion.student.name }}
-
{{ completion.student.class?.name || completion.student.classInfo?.name || '-' }}
+
{{ completion.student.class?.name || completion.student.classInfo?.name || + '-' }} +
@@ -331,7 +267,10 @@
暂无反馈 @@ -351,38 +290,29 @@
-
- +
+

暂无完成记录

- +
- + width="600px" :confirm-loading="submittingFeedback" @ok="submitFeedback" okText="提交评价" cancelText="取消"> -
+

提交内容

-
+
{{ selectedCompletionForFeedback.photos.length }} 张照片
@@ -420,13 +350,8 @@ - + @@ -461,6 +386,7 @@ import { } from '@ant-design/icons-vue'; import { getTeacherTasks, + getTeacherTask, createTeacherTask, updateTeacherTask, deleteTeacherTask, @@ -694,21 +620,32 @@ const getTaskTypeText = (type: string) => { return texts[type] || type; }; -// 打开编辑弹窗 -const openEditModal = (task: TeacherTask) => { +// 打开编辑弹窗：通过详情接口获取完整数据，回显与新增表单一致 +const openEditModal = async (task: TeacherTask) => { isEdit.value = true; editTaskId.value = task.id; - createForm.title = task.title; - createForm.description = task.description || ''; - createForm.taskType = task.taskType; - createForm.targetType = task.targetType; - createForm.relatedCourseId = task.relatedCourseId; - createForm.relatedBookName = task.relatedBookName || ''; // 添加绘本名称 - createForm.dateRange = [ - dayjs(task.startDate), - dayjs(task.endDate), - ]; createModalVisible.value = true; + try { + await loadOptions(); // 确保班级、学生、课程选项已加载 + const detail = await getTeacherTask(task.id); + // 详情接口返回字段映射到表单（与新增一致） + createForm.title = detail.title || ''; + createForm.description = detail.description || ''; + createForm.taskType = (detail.type || detail.taskType || 'READING') as 'READING' | 'ACTIVITY' | 'HOMEWORK'; + createForm.targetType = (detail.targetType?.toUpperCase?.() || 'CLASS') as 'CLASS' | 'STUDENT'; + createForm.targetIds = detail.targetIds || []; + // 关联课程：统一为 number，避免 API 返回 string 导致 a-select 无法匹配 + const rawCourseId = detail.courseId ?? detail.relatedCourseId; + createForm.relatedCourseId = rawCourseId; + createForm.relatedBookName = detail.relatedBookName || ''; + // 任务时间：dueDate 为空时用 startDate 作为结束日期，保证能回显 + createForm.dateRange = detail.startDate + ? [dayjs(detail.startDate), dayjs(detail.dueDate || detail.startDate)] + : null; + } catch (error: any) { + message.error(error.message || '加载任务详情失败'); + createModalVisible.value = false; + } }; // 创建/更新任务 @@ -1104,6 +1041,26 @@ onMounted(() => { } } +.completion-empty-state { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; + padding: 60px 20px; + color: #999; + + .empty-icon { + font-size: 48px; + color: #d9d9d9; + margin-bottom: 16px; + } + + p { + margin: 0; + } +} + .completion-list { max-height: 400px; overflow-y: auto; diff --git a/reading-platform-java/src/main/java/com/reading/platform/controller/teacher/TeacherTaskController.java b/reading-platform-java/src/main/java/com/reading/platform/controller/teacher/TeacherTaskController.java index dd08105..67c5bf2 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/controller/teacher/TeacherTaskController.java +++ b/reading-platform-java/src/main/java/com/reading/platform/controller/teacher/TeacherTaskController.java @@ -51,8 +51,9 @@ public class TeacherTaskController { @Operation(summary = "根据 ID 获取任务") @GetMapping("/{id}") public Result getTask(@PathVariable Long id) { - Task task = taskService.getTaskById(id); - return Result.success(taskMapper.toVO(task)); + Long tenantId = SecurityUtils.getCurrentTenantId(); + TaskResponse detail = taskService.getTaskDetailWithTargets(id, tenantId); + return Result.success(detail); } @Operation(summary = "获取任务分页列表") @@ -62,9 +63,11 @@ public class TeacherTaskController { @RequestParam(required = false, defaultValue = "10") Integer pageSize, @RequestParam(required = false) String keyword, @RequestParam(required = false) String type, + @RequestParam(required = false) String taskType, @RequestParam(required = false) String status) { Long tenantId = SecurityUtils.getCurrentTenantId(); - Page page = taskService.getTaskPage(tenantId, pageNum, pageSize, keyword, type, status); + String typeFilter = (type != null && !type.isEmpty()) ? type : taskType; + Page page = taskService.getTaskPage(tenantId, pageNum, pageSize, keyword, typeFilter, status); List voList = taskMapper.toVO(page.getRecords()); return Result.success(PageResult.of(voList, page.getTotal(), page.getCurrent(), page.getSize())); } diff --git a/reading-platform-java/src/main/java/com/reading/platform/controller/teacher/TeacherTaskTemplateController.java b/reading-platform-java/src/main/java/com/reading/platform/controller/teacher/TeacherTaskTemplateController.java index 0735697..1aefe38 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/controller/teacher/TeacherTaskTemplateController.java +++ b/reading-platform-java/src/main/java/com/reading/platform/controller/teacher/TeacherTaskTemplateController.java @@ -41,8 +41,9 @@ public class TeacherTaskTemplateController { @RequestParam(required = false, defaultValue = "10") Integer pageSize, @RequestParam(required = false) String type, @RequestParam(required = false) String keyword) { + // 教师查询其关联学校（tenant）下的所有模板，包括学校端建立的阅读模版 Long tenantId = SecurityUtils.getCurrentTenantId(); - Page page = taskTemplateService.getTemplates(tenantId, pageNum, pageSize, type, keyword, true); + Page page = taskTemplateService.getTemplates(tenantId, pageNum, pageSize, type, keyword, false); List voList = taskTemplateMapper.toVO(page.getRecords()); return Result.success(PageResult.of(voList, page.getTotal(), page.getCurrent(), page.getSize())); } diff --git a/reading-platform-java/src/main/java/com/reading/platform/dto/request/TaskCreateRequest.java b/reading-platform-java/src/main/java/com/reading/platform/dto/request/TaskCreateRequest.java index 2b92bdd..0fc13d0 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/dto/request/TaskCreateRequest.java +++ b/reading-platform-java/src/main/java/com/reading/platform/dto/request/TaskCreateRequest.java @@ -21,18 +21,27 @@ public class TaskCreateRequest { @Schema(description = "任务类型：reading-阅读，homework-作业，activity-活动") private String type; + @Schema(description = "任务类型（前端兼容 taskType）") + private String taskType; + @Schema(description = "关联绘本名称（手动填写）") private String relatedBookName; @Schema(description = "课程 ID") private Long courseId; + @Schema(description = "课程 ID（前端兼容 relatedCourseId）") + private Long relatedCourseId; + @Schema(description = "开始日期") private LocalDate startDate; @Schema(description = "截止日期") private LocalDate dueDate; + @Schema(description = "截止日期（前端兼容 endDate）") + private LocalDate endDate; + @Schema(description = "附件（JSON 数组）") private String attachments; diff --git a/reading-platform-java/src/main/java/com/reading/platform/dto/request/TaskUpdateRequest.java b/reading-platform-java/src/main/java/com/reading/platform/dto/request/TaskUpdateRequest.java index 7deea8f..beef917 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/dto/request/TaskUpdateRequest.java +++ b/reading-platform-java/src/main/java/com/reading/platform/dto/request/TaskUpdateRequest.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDate; +import java.util.List; @Data @Schema(description = "任务更新请求") @@ -18,6 +19,18 @@ public class TaskUpdateRequest { @Schema(description = "任务类型") private String type; + @Schema(description = "任务类型（前端兼容 taskType）") + private String taskType; + + @Schema(description = "关联绘本名称") + private String relatedBookName; + + @Schema(description = "课程 ID") + private Long courseId; + + @Schema(description = "课程 ID（前端兼容 relatedCourseId）") + private Long relatedCourseId; + @Schema(description = "开始日期") private LocalDate startDate; @@ -30,4 +43,10 @@ public class TaskUpdateRequest { @Schema(description = "附件（JSON 数组）") private String attachments; + @Schema(description = "目标类型：CLASS-班级，STUDENT-学生") + private String targetType; + + @Schema(description = "目标 IDs") + private List targetIds; + } diff --git a/reading-platform-java/src/main/java/com/reading/platform/dto/response/TaskResponse.java b/reading-platform-java/src/main/java/com/reading/platform/dto/response/TaskResponse.java index 18ed6f8..ffe61b5 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/dto/response/TaskResponse.java +++ b/reading-platform-java/src/main/java/com/reading/platform/dto/response/TaskResponse.java @@ -55,6 +55,12 @@ public class TaskResponse { @Schema(description = "附件") private String attachments; + @Schema(description = "目标类型：CLASS-班级，STUDENT-学生") + private String targetType; + + @Schema(description = "目标 IDs（班级或学生）") + private java.util.List targetIds; + @Schema(description = "创建时间") private LocalDateTime createdAt; diff --git a/reading-platform-java/src/main/java/com/reading/platform/service/TaskService.java b/reading-platform-java/src/main/java/com/reading/platform/service/TaskService.java index 89bfc62..a7d761a 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/service/TaskService.java +++ b/reading-platform-java/src/main/java/com/reading/platform/service/TaskService.java @@ -71,4 +71,9 @@ public interface TaskService extends com.baomidou.mybatisplus.extension.service. */ TaskResponse getTaskDetailForSchool(Long taskId, Long tenantId); + /** + * 获取任务详情（含目标类型、目标列表），用于编辑回显 + */ + TaskResponse getTaskDetailWithTargets(Long taskId, Long tenantId); + } diff --git a/reading-platform-java/src/main/java/com/reading/platform/service/impl/TaskServiceImpl.java b/reading-platform-java/src/main/java/com/reading/platform/service/impl/TaskServiceImpl.java index 851d1fd..d44b185 100644 --- a/reading-platform-java/src/main/java/com/reading/platform/service/impl/TaskServiceImpl.java +++ b/reading-platform-java/src/main/java/com/reading/platform/service/impl/TaskServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collections; @@ -51,13 +52,16 @@ public class TaskServiceImpl extends ServiceImpl task.setTenantId(tenantId); task.setTitle(request.getTitle()); task.setDescription(request.getDescription()); - task.setType(request.getType() != null ? request.getType() : "homework"); + String taskType = request.getType() != null ? request.getType() : request.getTaskType(); + task.setType(taskType != null ? taskType : "homework"); task.setRelatedBookName(request.getRelatedBookName()); // 添加关联绘本名称 - task.setCourseId(request.getCourseId()); + Long courseId = request.getCourseId() != null ? request.getCourseId() : request.getRelatedCourseId(); + task.setCourseId(courseId); task.setCreatorId(creatorId); task.setCreatorRole(creatorRole); task.setStartDate(request.getStartDate()); - task.setDueDate(request.getDueDate()); + LocalDate dueDate = request.getDueDate() != null ? request.getDueDate() : request.getEndDate(); + task.setDueDate(dueDate); task.setStatus("pending"); task.setAttachments(request.getAttachments()); @@ -89,8 +93,16 @@ public class TaskServiceImpl extends ServiceImpl if (request.getDescription() != null) { task.setDescription(request.getDescription()); } - if (request.getType() != null) { - task.setType(request.getType()); + String taskType = request.getType() != null ? request.getType() : request.getTaskType(); + if (taskType != null) { + task.setType(taskType); + } + if (request.getRelatedBookName() != null) { + task.setRelatedBookName(request.getRelatedBookName()); + } + Long courseId = request.getCourseId() != null ? request.getCourseId() : request.getRelatedCourseId(); + if (courseId != null) { + task.setCourseId(courseId); } if (request.getStartDate() != null) { task.setStartDate(request.getStartDate()); @@ -106,6 +118,22 @@ public class TaskServiceImpl extends ServiceImpl } taskMapper.updateById(task); + + // 更新任务目标 + if (request.getTargetIds() != null) { + taskTargetMapper.delete(new LambdaQueryWrapper().eq(TaskTarget::getTaskId, id)); + if (!request.getTargetIds().isEmpty()) { + String targetType = StringUtils.hasText(request.getTargetType()) ? request.getTargetType() : "CLASS"; + for (Long targetId : request.getTargetIds()) { + TaskTarget target = new TaskTarget(); + target.setTaskId(id); + target.setTargetType(targetType); + target.setTargetId(targetId); + taskTargetMapper.insert(target); + } + } + } + log.info("任务更新成功：id={}", id); return task; } @@ -518,10 +546,22 @@ public class TaskServiceImpl extends ServiceImpl @Override public TaskResponse getTaskDetailForSchool(Long taskId, Long tenantId) { - log.info("获取学校端任务详情：taskId={}, tenantId={}", taskId, tenantId); + return buildTaskDetailResponse(taskId, tenantId); + } - // 验证任务存在且属于该租户 + /** + * 获取任务详情（含目标类型、目标列表），用于编辑回显 + */ + public TaskResponse getTaskDetailWithTargets(Long taskId, Long tenantId) { + return buildTaskDetailResponse(taskId, tenantId); + } + + private TaskResponse buildTaskDetailResponse(Long taskId, Long tenantId) { Task task = getTaskByIdWithTenantCheck(taskId, tenantId); + List targets = taskTargetMapper.selectList( + new LambdaQueryWrapper().eq(TaskTarget::getTaskId, taskId)); + String targetType = targets.isEmpty() ? null : targets.get(0).getTargetType(); + List targetIds = targets.stream().map(TaskTarget::getTargetId).toList(); return TaskResponse.builder() .id(task.getId()) @@ -537,6 +577,8 @@ public class TaskServiceImpl extends ServiceImpl .dueDate(task.getDueDate()) .status(task.getStatus()) .attachments(task.getAttachments()) + .targetType(targetType) + .targetIds(targetIds) .createdAt(task.getCreatedAt()) .updatedAt(task.getUpdatedAt()) .build();