Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

fs-service/src/main/java/com/fs/course/param/FsCourseWatchLogListParam.java

@@ -105,4 +105,6 @@ public class FsCourseWatchLogListParam implements Serializable {
     private Long id;
 
     private Date createTime;
+    
+    private String appid;
 }

fs-service/src/main/java/com/fs/course/vo/FsCourseWatchLogListVO.java

@@ -138,5 +138,6 @@ public class FsCourseWatchLogListVO extends BaseEntity
     private Long imMsgSendDetailId;
 
     private String appid;
+    private String name;
 
 }

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

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFsCourseWatchLogListVO" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
         select l.log_id,l.project,l.period_id,l.user_id,uc.course_name,v.title as video_name,qec.avatar as external_user_avatar,
         l.log_type,SEC_TO_TIME(l.duration) as duration,c.company_name,l.camp_period_time,l.finish_time,l.appid,
-        cu.nick_name as company_user_name ,l.send_type,l.create_time,l.update_time,l.last_heartbeat_time,
+        cu.nick_name as company_user_name ,l.send_type,l.create_time,l.update_time,l.last_heartbeat_time,fcpsc.name,
         CASE 
             WHEN qu.qw_user_name IS NOT NULL AND qu.qw_user_name LIKE '{%' THEN JSON_UNQUOTE(JSON_EXTRACT(qu.qw_user_name, '$.name'))
             ELSE qu.qw_user_name 
@@ -73,7 +73,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          left join company c on c.company_id = l.company_id
          LEFT JOIN qw_user qu on qu.id= l.qw_user_id
          LEFT JOIN qw_external_contact qec on l.qw_external_contact_id = qec.id
+         LEFT JOIN fs_course_play_source_config fcpsc on l.appid = fcpsc.appid
         <where>
+            <if test ='maps.appid != null'>
+                and l.appid = #{maps.appid}
+            </if>
             <if test ='maps.isVip != null and maps.isVip == 0'>
                 and (l.user_id = 0 or l.user_id is null)
             </if>