diff --git a/src/main/java/com/huertian/jinduguanli/service/LessonTaskService.java b/src/main/java/com/huertian/jinduguanli/service/LessonTaskService.java index 6ef0100..8e5186b 100644 --- a/src/main/java/com/huertian/jinduguanli/service/LessonTaskService.java +++ b/src/main/java/com/huertian/jinduguanli/service/LessonTaskService.java @@ -51,7 +51,7 @@ public class LessonTaskService { } @Transactional - @CacheEvict(value = {"lessonTasks", "lessonTask"}, allEntries = true) + @CacheEvict(value = { "lessonTasks", "lessonTask" }, allEntries = true) public LessonTask create(LessonTaskRequest request) { logger.info("开始创建课程任务 - 课程名称: {}, 小课名称: {}, 用户ID: {}", request.getCourseName(), request.getMicroLessonName(), request.getUserId()); @@ -65,7 +65,7 @@ public class LessonTaskService { } @Transactional - @CacheEvict(value = {"lessonTasks", "lessonTask"}, allEntries = true) + @CacheEvict(value = { "lessonTasks", "lessonTask" }, allEntries = true) public LessonTask update(Long id, LessonTaskRequest request) { logger.info("开始更新课程任务 - 任务ID: {}, 进度状态: {}", id, request.getProgressStatus()); LessonTask task = findById(id); @@ -76,17 +76,34 @@ public class LessonTaskService { // 根据进度状态更新时间戳 long currentTime = System.currentTimeMillis() / 1000; switch (request.getProgressStatus()) { + case 0: // 初始状态 + task.setScriptUploadTime(null); + task.setScriptConfirmTime(null); + task.setVideoCaptureTime(null); + task.setVideoConfirmTime(null); + task.setFinishTime(null); + break; case 1: // 脚本上传 task.setScriptUploadTime(currentTime); + task.setScriptConfirmTime(null); + task.setVideoCaptureTime(null); + task.setVideoConfirmTime(null); + task.setFinishTime(null); break; case 2: // 脚本确认 task.setScriptConfirmTime(currentTime); + task.setVideoCaptureTime(null); + task.setVideoConfirmTime(null); + task.setFinishTime(null); break; case 3: // 视频拍摄 task.setVideoCaptureTime(currentTime); + task.setVideoConfirmTime(null); + task.setFinishTime(null); break; case 4: // 视频确认 task.setVideoConfirmTime(currentTime); + task.setFinishTime(null); break; case 5: // 任务完成 task.setFinishTime(currentTime); @@ -113,7 +130,7 @@ public class LessonTaskService { } @Transactional - @CacheEvict(value = {"lessonTasks", "lessonTask"}, allEntries = true) + @CacheEvict(value = { "lessonTasks", "lessonTask" }, allEntries = true) public void delete(Long id) { logger.info("开始删除课程任务 - 任务ID: {}", id); if (!lessonTaskRepository.existsById(id)) { @@ -133,7 +150,8 @@ public class LessonTaskService { */ public Page findByDepartmentIdAndNormalUser(Long departmentId, Pageable pageable) { logger.info("查询部门正常用户的课程任务,部门ID: {}", departmentId); - Page> result = lessonTaskRepository.findByDepartmentIdAndNormalUserWithUsername(departmentId, pageable); + Page> result = lessonTaskRepository + .findByDepartmentIdAndNormalUserWithUsername(departmentId, pageable); return result.map(map -> { LessonTask lessonTask = (LessonTask) map.get("lessonTask");