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

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

@@ -2899,27 +2899,6 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
                     vo.setProjectName(projectName);
                 }
             }
-            // 设置开始时间为当天的 00:00:00
-            if (vo.getStartDateTime() != null) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(vo.getStartDateTime());
-                calendar.set(Calendar.HOUR_OF_DAY, 0);
-                calendar.set(Calendar.MINUTE, 0);
-                calendar.set(Calendar.SECOND, 0);
-                calendar.set(Calendar.MILLISECOND, 0);
-                vo.setStartDateTime(calendar.getTime());
-            }
-
-            // 设置结束时间为当天的 23:59:59
-            if (vo.getEndDateTime() != null) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(vo.getEndDateTime());
-                calendar.set(Calendar.HOUR_OF_DAY, 23);
-                calendar.set(Calendar.MINUTE, 59);
-                calendar.set(Calendar.SECOND, 59);
-                calendar.set(Calendar.MILLISECOND, 999);
-                vo.setEndDateTime(calendar.getTime());
-            }
         });
 
         return vos;

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

@@ -316,6 +316,52 @@
             </if>
         </where>
     </select>
+<!--    <select id="selectFsUserCourseVideoListByMap" resultType="com.fs.course.vo.newfs.FsUserCourseVideoPageListVO">-->
+<!--        select-->
+<!--        video.video_id,-->
+<!--        video.title,-->
+<!--        video.description,-->
+<!--        video.video_url,-->
+<!--        video.thumbnail,-->
+<!--        video.duration,-->
+<!--        video.course_id,-->
+<!--        video.STATUS,-->
+<!--        video.course_sort,-->
+<!--        course.course_name,-->
+<!--        fcpd.period_id,-->
+<!--        fcp.period_name,-->
+<!--        fcpd.start_date_time,-->
+<!--        fcpd.end_date_time,-->
+<!--        fcpd.last_join_time,-->
+<!--        fcpd.id,-->
+<!--        fcp.period_name,-->
+<!--        if(fcp.period_starting_time is null, fcpd.start_date_time, fcp.period_starting_time) as startDateTime,-->
+<!--        if(fcp.period_end_time is null, fcpd.end_date_time, fcp.period_end_time) as endDateTime,-->
+<!--        course.project as projectId-->
+<!--        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 = #{params.companyUserId}-->
+<!--        where course.is_del = 0 and fcp.del_flag = '0' and fcpd.del_flag = '0' AND fcpd.`status`=1-->
+<!--        <if test="params.companyId != null">-->
+<!--            and FIND_IN_SET(#{params.companyId}, fcp.company_id)-->
+<!--        </if>-->
+<!--        <if test="params.dayDate != null">-->
+<!--            and fcpd.day_date = #{params.dayDate}-->
+<!--        </if>-->
+<!--        <if test="params.keyword != null and params.keyword !='' ">-->
+<!--            AND video.title LIKE concat('%',#{params.keyword},'%')-->
+<!--        </if>-->
+<!--        and (-->
+<!--        (fcpd.start_date_time &lt;=  CONCAT( CURDATE(), ' 23:59:59' ) and fcpd.end_date_time >= CONCAT( CURDATE(), ' 00:00:00' ))-->
+<!--        or (ccut.start_date_time &lt;=  CONCAT( CURDATE(), ' 23:59:59' ) and ccut.end_date_time >= CONCAT( CURDATE(), ' 00:00:00' ))-->
+<!--        )-->
+<!--        order by video.course_sort-->
+<!--    </select>-->
     <select id="selectFsUserCourseVideoListByMap" resultType="com.fs.course.vo.newfs.FsUserCourseVideoPageListVO">
         select
         video.video_id,
@@ -335,8 +381,8 @@
         fcpd.last_join_time,
         fcpd.id,
         fcp.period_name,
-        if(fcp.period_starting_time is null, fcpd.start_date_time, fcp.period_starting_time) as startDateTime,
-        if(fcp.period_end_time is null, fcpd.end_date_time, fcp.period_end_time) as endDateTime,
+        fcpd.start_date_time,
+        fcpd.end_date_time,
         course.project as projectId
         from `fs_user_course_video` video
         left join fs_user_course_period_days fcpd on fcpd.video_id = video.video_id