zyp

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseMapper.java

@@ -228,23 +228,22 @@ public interface FsUserCourseMapper
     List<FsUserCourse> selectFsUserCourseAllCourse();
 
     @Select({"<script> " +
-            "SELECT\n" +
-            "        c.*,\n" +
-            "        cc.cate_name,\n" +
-            "        ucc.cate_name AS sub_cate_name\n" +
+            "SELECT DISTINCT\n" +
+            "        fcp.period_id,\n" +
+            "        fcp.period_name\n" +
             "        FROM\n" +
-            "        fs_user_course c\n" +
-            "        LEFT JOIN fs_user_course_category cc ON c.cate_id = cc.cate_id\n" +
-            "        LEFT JOIN fs_user_course_category ucc ON ucc.cate_id = c.sub_cate_id\n" +
+            "        fs_user_course_period fcp\n" +
+            "        LEFT JOIN fs_user_course_period_days fcpd ON fcpd.period_id = fcp.period_id\n" +
+            "        LEFT JOIN fs_user_course c ON c.course_id = fcpd.course_id\n" +
             "        WHERE\n" +
             "        c.is_del = 0\n" +
-            "        AND FIND_IN_SET(#{companyId}, c.company_ids)\n" +
-            "<if test = ' keyword!=null and keyword != \"\" '> " +
-            "            AND c.course_name LIKE concat('%',#{keyword},'%'\n" +
+            "        AND FIND_IN_SET(#{companyId}, fcp.company_id)\n" +
+            "        <if test=\"keyword != null and keyword !='' \">\n" +
+            "            AND fcp.period_name LIKE concat('%',#{keyword},'%'\n" +
             "            )\n" +
-            "        </if>" +
+            "        </if>\n" +
             "        ORDER BY\n" +
-            "        c.course_id" +
+            "        fcp.create_time desc, fcp.period_status asc"+
             "</script>"})
     List<FsUserCourseListVO> getFsUserCourseList(FsUserCourseListParam param);
 

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

@@ -224,7 +224,7 @@
         </foreach>
     </update>
 
-    <select id="selectFsUserCourseVideoPageList" resultType="com.fs.course.vo.newfs.FsUserCourseVideoPageListVO">
+    <select id="selectFsUserCourseVideoPageList" resultType="FsUserCourseVideoPageListVO">
         SELECT
         DISTINCT video.video_id,
         video.title,
@@ -232,17 +232,22 @@
         video.video_url,
         video.thumbnail,
         video.duration,
-        video.create_time,
         video.course_id,
         video.STATUS,
         video.course_sort,
         course.course_name,
         fcpd.period_id,
-        fcpd.id
+        fcpd.id,
+        if(ccut.start_date_time is null, fcpd.start_date_time, ccut.start_date_time) as startDateTime,
+        if(ccut.end_date_time is null, fcpd.end_date_time, ccut.end_date_time) as endDateTime
         FROM `fs_user_course_video` video
         left join fs_user_course_period_days fcpd on fcpd.video_id = video.video_id
         left join fs_user_course_period fcp on fcp.period_id = fcpd.period_id
         LEFT JOIN fs_user_course course ON video.course_id = course.course_id
+        LEFT JOIN fs_user_course_company_user_time ccut ON ccut.period_id = fcpd.period_id
+        AND ccut.course_id = fcpd.course_id
+        AND ccut.video_id = fcpd.video_id
+        AND ccut.company_user_id = #{companyUserId}
         where course.is_del = 0
         AND FIND_IN_SET(#{companyId}, fcp.company_id)
         <if test="periodId != null and periodId !='' ">