Pārlūkot izejas kodu

feat:课程列表添加营期名称

caoliqin 1 dienu atpakaļ
vecāks
revīzija
3b98829edd

+ 1 - 0
fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -65,6 +65,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Component("task")

+ 3 - 0
fs-service/src/main/java/com/fs/course/vo/newfs/FsUserCourseVideoPageListVO.java

@@ -58,6 +58,9 @@ public class FsUserCourseVideoPageListVO extends BaseEntity {
     @ApiModelProperty(value = "营期id")
     private Long periodId;
 
+    @ApiModelProperty(value = "营期名称")
+    private String periodName;
+
     @ApiModelProperty(value = "营期课程ID")
     private Long id;
 

+ 2 - 0
fs-service/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -262,6 +262,7 @@
         video.course_sort,
         course.course_name,
         fcpd.period_id,
+        fcp.period_name,
         fcpd.id,
         if(ccut.start_date_time is null, fcpd.start_date_time, ccut.start_date_time) as startDateTime,
         if(ccut.end_date_time is null, fcpd.end_date_time, ccut.end_date_time) as endDateTime,
@@ -317,6 +318,7 @@
         fcpd.end_date_time,
         fcpd.last_join_time,
         fcpd.id,
+        fcp.period_name,
         if(ccut.start_date_time is null, fcpd.start_date_time, ccut.start_date_time) as startDateTime,
         if(ccut.end_date_time is null, fcpd.end_date_time, ccut.end_date_time) as endDateTime,
         course.project as projectId