搜索条件新增

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -312,17 +312,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and cgu.grade_id = #{gradeId}
         </if>
         <if test="choice != null and choice == 1 ">
-            and (SELECT COUNT(cge.grade_id) FROM class_grade cge LEFT JOIN class_grade_user cgur on cge.grade_id = cgur.grade_id where cgu.user_id =cgur.user_id and (SELECT cgg.goods_id FROM class_grade_goods cgg
-            where cge.grade_id=cgg.grade_id) = (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id)  AND unix_timestamp(now()) BETWEEN cge.class_start_time and cge.class_end_time
-                                                                                                                               and cge.`status`=1 and cgur.`status` =1)= 0
-            and cgu.period_status=0
-            AND (SELECT COUNT(cgde.grade_id) FROM class_grade cgde where cgde.grade_id = cg.grade_id and unix_timestamp(now()) BETWEEN cgde.class_start_time and cgde.class_end_time) =0
+            and (SELECT COUNT(cge.grade_id) FROM class_grade cge LEFT JOIN class_grade_user cgur on cge.grade_id = cgur.grade_id where cgu.user_id =cgur.user_id and (SELECT cgg.goods_id FROM class_grade_goods cgg where cge.grade_id=cgg.grade_id) = (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id)  AND (unix_timestamp(now()) &lt; g.class_end_time or g.class_start_time is null) and cge.`status`=1 and cgur.`status` =1)= 0 and cgu.period_status=0
+            AND (SELECT COUNT(cgde.grade_id) FROM class_grade cgde where cgde.grade_id = cg.grade_id and (unix_timestamp(now()) &lt; g.class_end_time or g.class_start_time is null)) =0
         </if>
         <if test="choice != null and choice == 2 ">
             and (SELECT COUNT(cge.grade_id) FROM class_grade cge LEFT JOIN class_grade_user cgur on cge.grade_id = cgur.grade_id where cgu.user_id =cgur.user_id and (SELECT cgg.goods_id FROM class_grade_goods cgg
-            where cge.grade_id=cgg.grade_id) = (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id)  AND unix_timestamp(now()) BETWEEN cge.class_start_time and cge.class_end_time
+            where cge.grade_id=cgg.grade_id) = (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id)  AND (unix_timestamp(now()) &lt; g.class_end_time or g.class_start_time is null)
             and cge.`status`=1 and cgur.`status` =1)> 0
-            AND (SELECT COUNT(cgde.grade_id) FROM class_grade cgde where cgde.grade_id = cg.grade_id and unix_timestamp(now()) BETWEEN cgde.class_start_time and cgde.class_end_time) =0
+            AND (SELECT COUNT(cgde.grade_id) FROM class_grade cgde where cgde.grade_id = cg.grade_id and (unix_timestamp(now()) &lt; g.class_end_time or g.class_start_time is null)) =0
         </if>
         order by cgu.create_time desc
     </select>