feat：销售端添加看课记录看课类型导出

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -148,7 +148,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
     private static final String SHORT_LINK_PREFIX = "/courseH5/pages/course/learning?s=";
     // 排除看课数量限制的公司集合
     private static final Set<String> EXCLUDE_PROJECTS = new HashSet<>(Arrays.asList(
-            "福本源", "宽益堂", "叮当国医", "易行健","河山医院"
+            "福本源", "宽益堂", "叮当国医", "易行健","河山医院", "鸿森堂"
     ));
     @Autowired
     ICompanyService companyService;

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

@@ -143,9 +143,11 @@ public class FsCourseWatchLogListVO extends BaseEntity
 
     private Long deptId;
 
-    //看课方式：1 app  2 小程序
     private Integer watchType;
 
+    @Excel(name = "看课类型")
+    private String watchTypeName;
+
     /**
     * 标签
     */

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

@@ -990,6 +990,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         l.qw_user_id,
         l.qw_external_contact_id,
         l.sop_id,
+        case when l.watch_type = 1 then 'app' when l.watch_type = 2 then '小程序' end AS watchTypeName,
         qec.create_time as qec_create_time,
         u.last_ip
         FROM
@@ -1027,6 +1028,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test ='maps.companyUserId !=null'>
                 and l.company_user_id = #{maps.companyUserId}
             </if>
+            <if test ='maps.watchType !=null'>
+                and l.watch_type = #{maps.watchType}
+            </if>
             <if test ='maps.companyUserName !=null and maps.companyUserName!=""'>
                 and cu.nick_name  like concat('%', #{maps.companyUserName}, '%')
             </if>