Przeglądaj źródła

feat: 调整销售app今日课程的逻辑

caoliqin 1 dzień temu
rodzic
commit
49dcb279d0

+ 1 - 1
fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -200,7 +200,7 @@ public class FsUserCourseVideoController extends AppBaseController {
 
         Map<String, Object> params = new HashMap<>();
         params.put("companyId", companyId);
-        params.put("dayDate", LocalDate.now());
+//        params.put("dayDate", LocalDate.now());
         params.put("companyUserId", Long.parseLong(getUserId()));
 
         PageHelper.startPage(pageNum, pageSize);

+ 2 - 3
fs-service-system/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -306,9 +306,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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>
+        and ((fcpd.start_date_time &lt;= CURDATE() and fcpd.end_date_time >= CURDATE())
+        or (ccut.start_date_time &lt;= CURDATE() and ccut.end_date_time >= CURDATE()))
         order by video.course_sort
     </select>
     <select id="selectFsUserCourseVideoByVideoIdAndUserId" resultType="com.fs.course.domain.FsUserCourseVideo">