fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentVo.java

@@ -261,4 +261,9 @@ public class ClassGradeStudentVo {
 	@ApiModelProperty("审核状态  1通过 3不通过 2待审")
 	private Integer profileStatus;
 
+	/** 开班状态 0未开班 1开班 */
+	@Excel(name = "开班状态 0未开班 1开班")
+	@ApiModelProperty("开班状态 0未开班 1开班")
+	private Integer classStatus;
+
 }

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

@@ -187,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gradeName" column="class_name"/>
         <result property="endTime" column="end_time"/>
         <result property="profileStatus" column="profile_status"/>
+        <result property="classStatus" column="class_status"/>
     </resultMap>
 
 
@@ -589,6 +590,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         g.study_end_time,
         cg.class_start_time,
         cg.class_end_time,
+        cg.class_status,
         cg.interface_push_id,
         cgu.official_status,
         cgu.official_status_msg,
@@ -1354,7 +1356,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) >0
         </if>
         <if test="classStatus != null and  classStatus==0">
-            AND g.class_status =  #{classStatus}
+            AND (g.class_status =  #{classStatus} or g.class_status =  is null )
         </if>
         <if test="classStatus != null and  classStatus==1">
             AND g.class_status =  1 and g.class_end_time >= unix_timestamp(now())
@@ -1443,7 +1445,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) >0)
         </if>
         <if test="classStatus != null and  classStatus==0">
-            AND g.class_status =  #{classStatus}
+            AND (g.class_status =  #{classStatus} or g.class_status =  is null )
         </if>
         <if test="classStatus != null and  classStatus==1">
             AND g.class_status =  1 and g.class_end_time >= unix_timestamp(now())