1、中康看课记录、我的看课记录增加条件查询

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

@@ -61,6 +61,7 @@ public class FsCourseWatchLogListParam implements Serializable {
 
 
     private Long taskId;//任务ID
+    private Long project;//任务ID
 
     private String customPageStr;
 

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

@@ -1836,6 +1836,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         LocalDateTime effectiveEndTime = companyUserEndDateTime != null ?
                 companyUserEndDateTime : periodDays.getEndDateTime();
         // 检查时间范围和状态
+        log.error("传入参数：开始时间：{}，结束时间：{}，periodDays={}",effectiveStartTime,effectiveEndTime,periodDays);
         return DateUtil.isWithinRangeSafe(LocalDateTime.now(), effectiveStartTime, effectiveEndTime)&& periodDays.getStatus() == 1;
     }
 

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.ad.enums.AdUploadType;
 import com.fs.ad.service.IAdHtmlClickLogService;
@@ -2171,9 +2172,13 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
     @Override
     public QwUser getQwUserByRedisForId(String qwUserId) {
         String key =(String)redisCache.getCacheObject("qwUserRdById:"+qwUserId);
-        if (!StringUtil.strIsNullOrEmpty(key)){
+        if (ObjectUtils.isNotEmpty(key)&& !StringUtil.strIsNullOrEmpty(key)){
             return JSON.parseObject(key, QwUser.class);
         }
+        logger.error("qwUserId:{}",qwUserId);
+        if (ObjectUtils.isEmpty(qwUserId)||qwUserId.equals("null")){
+            return null;
+        }
         QwUser qwUser = qwUserMapper.selectQwUserById(Long.valueOf(qwUserId));
         if (qwUser==null){
             return null;

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

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectFsCourseWatchLogListVO" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
-        select l.log_id,l.user_id,uc.course_name,v.title as video_name,qec.avatar as external_user_avatar,
+        select l.log_id,l.project,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,
         cu.nick_name as company_user_name ,l.send_type,l.create_time,l.update_time,l.last_heartbeat_time,
         qu.qw_user_name,qec.name as external_user_name,c.company_id,u.avatar as fsAvatar,u.nick_name as fsNickName,qec.create_time as qec_create_time,
@@ -78,6 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test ='maps.userId !=null'>
                 and l.user_id = #{maps.userId}
             </if>
+            <if test ='maps.project !=null'>
+                and l.project = #{maps.project}
+            </if>
             <if test ='maps.qwExternalContactId !=null'>
                 and l.qw_external_contact_id = #{maps.qwExternalContactId}
             </if>