From 689e5fa18a6d8ced8393a376b927240e342b0699 Mon Sep 17 00:00:00 2001 From: chenyuan Date: Tue, 4 Aug 2026 15:22:02 +0800 Subject: [PATCH] fix: keep comprehensive training last --- .../linkCommerce/service/impl/TrainingTaskServiceImpl.java | 6 ++++-- .../service/impl/TrainingTaskServiceImplTest.java | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sztzjy/linkCommerce/service/impl/TrainingTaskServiceImpl.java b/src/main/java/com/sztzjy/linkCommerce/service/impl/TrainingTaskServiceImpl.java index 436be99..063146b 100644 --- a/src/main/java/com/sztzjy/linkCommerce/service/impl/TrainingTaskServiceImpl.java +++ b/src/main/java/com/sztzjy/linkCommerce/service/impl/TrainingTaskServiceImpl.java @@ -518,7 +518,9 @@ public class TrainingTaskServiceImpl implements TrainingTaskService { return new ArrayList<>(); } return tasks.stream() - .sorted(Comparator.comparing(task -> task.getSort() == null ? 0 : task.getSort())) + .sorted(Comparator + .comparing((TrainingTask task) -> COMPREHENSIVE_CASE_TRAINING_TASK_KEY.equals(task.getTaskKey())) + .thenComparing(task -> task.getSort() == null ? 0 : task.getSort())) .collect(Collectors.toList()); } @@ -861,7 +863,6 @@ public class TrainingTaskServiceImpl implements TrainingTaskService { private List defaultTasks() { List tasks = new ArrayList<>(); - addDefault(tasks, "综合实训", COMPREHENSIVE_CASE_TRAINING_TASK_KEY, "综合案例实训"); addDefault(tasks, "互联网产品开发基础认知", "new-product-survey", "新产品调查与分析"); addDefault(tasks, "互联网产品开发基础认知", "product-development-factors", "产品开发关键因素"); addDefault(tasks, "互联网产品开发基础认知", "product-development-process", "产品开发主要流程"); @@ -885,6 +886,7 @@ public class TrainingTaskServiceImpl implements TrainingTaskService { addDefault(tasks, "产品上线与运营推广", "release-channel-evaluation", "产品发布渠道评估"); addDefault(tasks, "产品上线与运营推广", "promotion-effect-optimization", "投放效果评估与优化"); addDefault(tasks, "产品上线与运营推广", "product-diagnosis-iteration", "产品问题诊断与迭代"); + addDefault(tasks, "综合实训", COMPREHENSIVE_CASE_TRAINING_TASK_KEY, "综合案例实训"); return tasks; } diff --git a/src/test/java/com/sztzjy/linkCommerce/service/impl/TrainingTaskServiceImplTest.java b/src/test/java/com/sztzjy/linkCommerce/service/impl/TrainingTaskServiceImplTest.java index d18bdfb..c65bfcd 100644 --- a/src/test/java/com/sztzjy/linkCommerce/service/impl/TrainingTaskServiceImplTest.java +++ b/src/test/java/com/sztzjy/linkCommerce/service/impl/TrainingTaskServiceImplTest.java @@ -224,9 +224,10 @@ class TrainingTaskServiceImplTest { ArgumentCaptor captor = ArgumentCaptor.forClass(TrainingTask.class); verify(service.trainingTaskMapper, times(23)).insertSelective(captor.capture()); assertFalse(captor.getAllValues().stream().anyMatch(task -> "new-product-survey".equals(task.getTaskKey()))); - assertEquals("comprehensive-case-training", captor.getAllValues().get(0).getTaskKey()); - assertEquals("综合实训", captor.getAllValues().get(0).getProjectName()); - assertEquals("综合案例实训", captor.getAllValues().get(0).getTaskName()); + TrainingTask comprehensive = captor.getAllValues().get(captor.getAllValues().size() - 1); + assertEquals("comprehensive-case-training", comprehensive.getTaskKey()); + assertEquals("综合实训", comprehensive.getProjectName()); + assertEquals("综合案例实训", comprehensive.getTaskName()); } @Test