添加查询课程过期时间的不查

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/CoachServiceImpl.java

@@ -79,7 +79,8 @@ public class CoachServiceImpl implements ICoachService {
         //写死默认一页50条 全部展示
         Page<CourseResponseVo> page = new Page<CourseResponseVo>(1,100);
         //查询课时列表
-        IPage<CourseResponseVo> byCourseList = appCoursesMapper.findByCourseList(page, courseRequestVo);
+        Date date = new Date();
+        IPage<CourseResponseVo> byCourseList = appCoursesMapper.findByCourseList(page, courseRequestVo,date);
         appCoachDetailsVO.setCourseInfoVOList(byCourseList.getRecords());
         if (appCoachDetailsVO.getCourseInfoVOList()!=null){
             for (CourseResponseVo courseResponseVo : appCoachDetailsVO.getCourseInfoVOList()) {

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/DetailServiceImpl.java

@@ -259,6 +259,7 @@ public class DetailServiceImpl implements IDetailService {
                 .eq(AppCourses::getAddressSiteId, id)
                 .like(AppCourses::getCategoryId, categoryId)
                 .eq(AppCourses::getRackingStatus, 0)
+                .gt(AppCourses::getEndTime, new Date())
                 .eq(AppCourses::getDelFlag, 0)).forEach(appCourses -> {
             List<String> list = Arrays.asList(appCourses.getCover().split(","));
             PlaceInfoVO.CourseInfoVO courseInfoVO = new PlaceInfoVO.CourseInfoVO();
@@ -374,16 +375,17 @@ public class DetailServiceImpl implements IDetailService {
     @Override
     public IPage<CourseResponseVo> findByCourseList(CourseRequestVo courseRequestVo) {
         Page<CourseResponseVo> page = new Page<CourseResponseVo>(courseRequestVo.getPageNo(), courseRequestVo.getPageSize());
+        Date date = new Date();
         IPage<CourseResponseVo>  courseInfoVOIPage=null;
         if (ObjectUtil.isNotEmpty(courseRequestVo.getOrderByType())){
             if (ObjectUtil.isNotEmpty(courseRequestVo.getLongitude())
                     &&ObjectUtil.isNotEmpty(courseRequestVo.getLatitude())){
-                courseInfoVOIPage= appCoursesMapper.findByLaLoList(page,courseRequestVo);
+                courseInfoVOIPage= appCoursesMapper.findByLaLoList(page,courseRequestVo,date);
             }else {
-                courseInfoVOIPage= appCoursesMapper.findByList(page,courseRequestVo);
+                courseInfoVOIPage= appCoursesMapper.findByList(page,courseRequestVo,date);
             }
         }else {
-            courseInfoVOIPage= appCoursesMapper.findByCourseList(page,courseRequestVo);
+            courseInfoVOIPage= appCoursesMapper.findByCourseList(page,courseRequestVo,date);
         }
         courseInfoVOIPage.getRecords().forEach(courseResponseVo -> {
             String string = courseResponseVo.getCover().split(",")[0];

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/AppCoursesMapper.java

@@ -16,6 +16,7 @@ import org.jeecg.modules.system.app.dto.AppCoursesInfoPageDTO;
 import org.jeecg.modules.system.app.dto.AppCoursesPageDTO;
 import org.jeecg.modules.system.app.entity.AppCourses;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -44,11 +45,11 @@ public interface AppCoursesMapper extends BaseMapper<AppCourses> {
      **/
     CourseInfoVO getCourseInfo(@Param("id")String id);
 
-    IPage<CourseResponseVo> findByCourseList(@Param("page") Page<CourseResponseVo> page,@Param("courseRequestVo") CourseRequestVo courseRequestVo);
+    IPage<CourseResponseVo> findByCourseList(@Param("page") Page<CourseResponseVo> page,@Param("courseRequestVo") CourseRequestVo courseRequestVo, @Param("date")  Date date);
 
-    IPage<CourseResponseVo> findByLaLoList(@Param("page") Page<CourseResponseVo> page,@Param("courseRequestVo") CourseRequestVo courseRequestVo);
+    IPage<CourseResponseVo> findByLaLoList(@Param("page") Page<CourseResponseVo> page, @Param("courseRequestVo") CourseRequestVo courseRequestVo, @Param("date")  Date date);
 
-    IPage<CourseResponseVo> findByList(@Param("page") Page<CourseResponseVo> page,@Param("courseRequestVo") CourseRequestVo courseRequestVo);
+    IPage<CourseResponseVo> findByList(@Param("page") Page<CourseResponseVo> page,@Param("courseRequestVo") CourseRequestVo courseRequestVo, @Param("date")  Date date);
 
     IPage<AppCoursesInfoPageDTO> queryWitchPriceRulesPage(Page<AppCourses> page, @Param("dto") AppCoursesPageDTO dto);
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppCoursesMapper.xml

@@ -91,7 +91,7 @@
         FROM nm_courses b
         LEFT JOIN nm_courses_price_rules c on b.id= c.courses_id
         LEFT JOIN nm_site e on e.id = b.address_site_id
-        where 1=1 and b.racking_status=0 and b.del_flag =0
+        where 1=1 and b.racking_status=0 and b.del_flag =0 and b.end_time > #{date}
         <if test="courseRequestVo.instructorId != null and courseRequestVo.instructorId !=''">
             and  b.user_id=#{courseRequestVo.instructorId}
         </if>
@@ -113,7 +113,7 @@
         FROM nm_courses b
         LEFT JOIN nm_courses_price_rules c on b.id= c.courses_id
         LEFT JOIN nm_site e on e.id = b.address_site_id
-        where 1=1 AND b.del_flag = 0 and b.racking_status = 0
+        where 1=1 AND b.del_flag = 0 and b.racking_status = 0 and b.end_time > #{date}
         <if test="courseRequestVo.instructorId != null and courseRequestVo.instructorId !=''">
             and  b.user_id=#{courseRequestVo.instructorId}
         </if>
@@ -143,7 +143,7 @@
         FROM nm_courses b
         LEFT JOIN nm_courses_price_rules c on b.id= c.courses_id
         LEFT JOIN nm_site e on e.id = b.address_site_id
-        where 1=1 AND b.del_flag = 0 and b.racking_status = 0
+        where 1=1 AND b.del_flag = 0 and b.racking_status = 0 and b.end_time > #{date}
         <if test="courseRequestVo.instructorId != null and courseRequestVo.instructorId !=''">
             and  b.user_id=#{courseRequestVo.instructorId}
         </if>