考前安排

zhongzheng-api/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -55,6 +55,7 @@ public class ClassGradeController extends BaseController {
         bo.setClassStartTime(DateUtils.getNowTime());
         bo.setClassEndTime(DateUtils.getNowTime());
         bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
+        bo.setPastDue(1L);
         List<ClassGradeVo> list = iClassGradeService.queryList(bo);
         return getDataTable(list);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java

@@ -119,4 +119,8 @@ public class ClassGradeQueryBo extends BaseEntity {
 	/** 商品id */
 	@ApiModelProperty("商品id")
 	private Long goodsId;
+
+	/** 商品id */
+	@ApiModelProperty("是否过滤有效期 1过滤")
+	private Long pastDue;
 }

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

@@ -178,6 +178,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="classStartTime != null or classEndTime != null ">
             AND (#{classStartTime} BETWEEN g.class_start_time and g.class_end_time or #{classEndTime} BETWEEN g.class_start_time and g.class_end_time)
         </if>
+        <if test="pastDue != null or pastDue != null ">
+            AND (unix_timestamp(now()) BETWEEN g.class_start_time and g.class_end_time or g.class_start_time is null)
+        </if>
         <if test="educationTypeId != null and educationTypeId !='' ">
             AND (
             SELECT