战术更新

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

@@ -88,11 +88,11 @@ public class TrainingStartClassLogTechnicianServiceImpl extends ServiceImpl<Trai
 
             List<Integer> trainingCourseIdList = trainingStartClassesMap.values().stream().map(TrainingStartClass::getCourseId).collect(Collectors.toList());
             if (ListUtil.isNotEmpty(trainingCourseIdList)) {
-                Map<Integer, TrainingCourse> trainingCourseMap = trainingCourseMapper.selectBatchIds(trainingCourseIdList).stream()
-                        .collect(Collectors.toMap(TrainingCourse::getId, trainingCourse -> trainingCourse, (k1, k2) -> k1));
+                Map<Integer, List<TrainingCourse>> trainingCourseGroup = trainingCourseMapper.listByTrainingStartClassIds(trainingCourseIdList).stream()
+                        .collect(Collectors.groupingBy(TrainingCourse::getId);
 
                 trainingStartClassesMap.values().forEach(trainingStartClass -> {
-                    trainingStartClass.setTrainingCourse(trainingCourseMap.get(trainingStartClass.getCourseId()));
+                    trainingStartClass.setTrainingCourseList(trainingCourseGroup.get(trainingStartClass.getCourseId()));
                 });
             }
 
@@ -116,12 +116,13 @@ public class TrainingStartClassLogTechnicianServiceImpl extends ServiceImpl<Trai
         }
 
         //join
-        List<Integer> courseIds = page.getRecords().stream().map(TrainingStartClass::getCourseId).collect(Collectors.toList());
-        List<TrainingCourse> trainingCourseList = trainingCourseMapper.selectBatchIds(courseIds);
+        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));
+
         page.getRecords().forEach(trainingStartClass -> {
             if (ListUtil.isNotEmpty(map.get(trainingStartClass.getCourseId()))) {
-                trainingStartClass.setTrainingCourse(map.get(trainingStartClass.getCourseId()).stream().findAny().orElse(null));
+                trainingStartClass.setTrainingCourseList(map.get(trainingStartClass.getCourseId()));
             }
         });
         return page;

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

@@ -14,6 +14,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 @TableName("training_start_class")
 @AllArgsConstructor
@@ -24,6 +25,7 @@ public class TrainingStartClass implements Serializable {
     @TableId(type = IdType.AUTO)
     private Integer id;
 
+    @TableField(exist = false)
     @ApiModelProperty("课程id")
     private Integer courseId;
 
@@ -50,7 +52,7 @@ public class TrainingStartClass implements Serializable {
 
     @ApiModelProperty("课程")
     @TableField(exist = false)
-    private TrainingCourse trainingCourse;
+    private List<TrainingCourse> trainingCourseList;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("结束时间")

src/main/java/com/gogirl/infrastructure/mapper/store/training/TrainingCourseMapper.java

@@ -2,6 +2,17 @@ package com.gogirl.infrastructure.mapper.store.training;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gogirl.domain.store.training.TrainingCourse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface TrainingCourseMapper extends BaseMapper<TrainingCourse> {
+
+    /**
+     * 根据train
+     *
+     * @param trainingStartClassIds
+     * @return
+     */
+    List<TrainingCourse> listByTrainingStartClassIds(@Param("trainingStartClassIds") List<Integer> trainingStartClassIds);
 }

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!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
+        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
+        <foreach collection="trainingStartClassIds" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
+</mapper>