feat：叮当-会员详情训练营展示销售

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -758,7 +758,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
 
-    <select id="selectListBytrainingCampId" resultType="com.fs.course.vo.FsCourseWatchLogVO">
+    <select id="selectListBytrainingCampId" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
         select
         uc.course_name,v.title as video_name,
         watch.log_id,
@@ -777,7 +777,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         watch.company_user_id,
         watch.company_id,
         watch.course_id,
-        watch.camp_period_time
+        watch.camp_period_time,
+        company_user.nick_name as companyUserName
         from
         fs_user_course_training_camp camp
         left join fs_user_course_period period on
@@ -786,6 +787,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         period.period_id = watch.period_id
         left join fs_user_course uc on uc.course_id = watch.course_id
         left join fs_user_course_video v on v.video_id = watch.video_id
+        left join company_user on company_user.user_id = watch.company_user_id
         <where>
             `period`.del_flag = '0' and watch.log_type &lt;&gt; 3
             <if test="trainingCampId != null">and camp.training_camp_id = #{trainingCampId}</if>