金牛全选销售不变得问题处理，导出问题处理

fs-service/src/main/java/com/fs/course/domain/FsCourseFinishTemp.java

@@ -54,6 +54,7 @@ public class FsCourseFinishTemp extends BaseEntity
     /** 删除标志 */
     @Excel(name = "删除标志")
     private Long isDel;
-    @Excel(name = "删除标志")
+
+    @Excel(name = "全选销售标志")
     private Integer isAllCompanyUser;
 }

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

@@ -1022,7 +1022,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
             if(ObjectUtils.isNotNull(item.getUserId())) {
                 FsUser fsUser = fsUserCacheService.selectFsUserById(item.getUserId());
                 if(ObjectUtils.isNotNull(fsUser)){
-                    item.setUserName(String.format("%s_%d",fsUser.getNickname(),fsUser.getUserId()));
+                    item.setExternalUserName(String.format("%s_%d",fsUser.getNickname(),fsUser.getUserId()));
                     item.setFsNickName(fsUser.getNickname());
                     item.setFsAvatar(fsUser.getAvatar());
                 }

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

@@ -25,14 +25,11 @@ public class FsCourseWatchLogListVO extends BaseEntity
 //    @Excel(name = "会员id")
     private Long userId;
 
-    @Excel(name = "会员名称")
-    private String userName;
-
     /** 小程序昵称 */
     @Excel(name = "小程序昵称")
     private String fsNickName;
 
-//    @Excel(name = "客户昵称")
+    @Excel(name = "客户昵称")
     private String externalUserName;
 
     /** 外部联系人头像 */

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

@@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="videoId != null">video_id = #{videoId},</if>
             <if test="companyUserIds != null">company_user_ids = #{companyUserIds},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isAllCompanyUser != null">is_all_company_user = #{isAllCompanyUser},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
         </trim>
         where id = #{id}