战术更新

src/main/java/com/gogirl/application/store/training/impl/TrainingStartClassLogTechnicianServiceImpl.java

@@ -89,10 +89,10 @@ public class TrainingStartClassLogTechnicianServiceImpl extends ServiceImpl<Trai
             List<Integer> trainingCourseIdList = trainingStartClassesMap.values().stream().map(TrainingStartClass::getCourseId).collect(Collectors.toList());
             if (ListUtil.isNotEmpty(trainingCourseIdList)) {
                 Map<Integer, List<TrainingCourse>> trainingCourseGroup = trainingCourseMapper.listByTrainingStartClassIds(trainingCourseIdList).stream()
-                        .collect(Collectors.groupingBy(TrainingCourse::getId));
+                        .collect(Collectors.groupingBy(TrainingCourse::getTrainingStartClassId));
 
                 trainingStartClassesMap.values().forEach(trainingStartClass -> {
-                    trainingStartClass.setTrainingCourseList(trainingCourseGroup.get(trainingStartClass.getCourseId()));
+                    trainingStartClass.setTrainingCourseList(trainingCourseGroup.get(trainingStartClass.getId()));
                 });
             }
 
@@ -117,12 +117,13 @@ public class TrainingStartClassLogTechnicianServiceImpl extends ServiceImpl<Trai
 
         //join
         List<Integer> trainingStartClassIds = page.getRecords().stream().map(TrainingStartClass::getId).collect(Collectors.toList());
-        List<TrainingCourse> trainingCourseList = trainingCourseMapper.listByTrainingStartClassIds(trainingStartClassIds);
-        Map<Integer, List<TrainingCourse>> map = trainingCourseList.stream().collect(Collectors.groupingBy(TrainingCourse::getId));
+
+        Map<Integer, List<TrainingCourse>> map = trainingCourseMapper.listByTrainingStartClassIds(trainingStartClassIds).stream()
+                .collect(Collectors.groupingBy(TrainingCourse::getTrainingStartClassId));
 
         page.getRecords().forEach(trainingStartClass -> {
             if (ListUtil.isNotEmpty(map.get(trainingStartClass.getCourseId()))) {
-                trainingStartClass.setTrainingCourseList(map.get(trainingStartClass.getCourseId()));
+                trainingStartClass.setTrainingCourseList(map.get(trainingStartClass.getId()));
             }
         });
         return page;

src/main/java/com/gogirl/domain/store/training/TrainingCourse.java

@@ -46,5 +46,8 @@ public class TrainingCourse implements Serializable {
 
     @ApiModelProperty("课程优势")
     private String advantage;
+
+    @TableField(exist = false)
+    private Integer trainingStartClassId;
 }
 

src/main/resources/mapper/store/TrainingCourseMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gogirl.infrastructure.mapper.store.training.TrainingCourseMapper">
     <select id="listByTrainingStartClassIds" resultType="com.gogirl.domain.store.training.TrainingCourse">
-        select * from training_start_class t1
+        select t1.id traing_start_class_id,t3.* from training_start_class t1
         left join training_start_class_course t2 on t1.id =t2.training_start_class_id
         left join training_course t3 on t2.training_course_id =t3.id
         where t1.id in