fix

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

@@ -1353,9 +1353,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND u.realname  like concat('%', #{userName}, '%')
             ) >0
         </if>
-        <if test="classStatus != null and  classStatus!=2">
+        <if test="classStatus != null and  classStatus==0">
             AND g.class_status =  #{classStatus}
         </if>
+        <if test="classStatus != null and  classStatus==1">
+            AND g.class_status =  1 and g.class_end_time >= unix_timestamp(now())
+        </if>
         <if test="classStatus != null and  classStatus == 2 ">
             AND g.class_status =  1 and unix_timestamp(now()) > g.class_end_time
         </if>
@@ -1439,10 +1442,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND d.goods_name  like concat('%', #{searchKey}, '%')
             ) >0)
         </if>
-        <if test="classStatus != null and  classStatus!=2">
+        <if test="classStatus != null and  classStatus==0">
             AND g.class_status =  #{classStatus}
         </if>
-        <if test="classStatus != null and  classStatus ==2 ">
+        <if test="classStatus != null and  classStatus==1">
+            AND g.class_status =  1 and g.class_end_time >= unix_timestamp(now())
+        </if>
+        <if test="classStatus != null and  classStatus == 2 ">
             AND g.class_status =  1 and unix_timestamp(now()) > g.class_end_time
         </if>
         <if test="atFull != null and atFull !='' ">