导出资料表格

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

@@ -52,8 +52,6 @@ public class ClassGradeController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<ClassGradeVo> list(ClassGradeQueryBo bo) {
         startPage();
-        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);

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

@@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="atFull != null and atFull !='' ">
             AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = g.grade_id and a.status =1) &lt; g.student_upper
         </if>
-        <if test="classStartTime != null or classEndTime != null ">
+        <if test="classStartTime != null and classStartTime != ''  and classEndTime != null and classEndTime != ''">
             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 ">