he2802 1 rok temu
rodzic
commit
e1030154a7

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

@@ -1439,9 +1439,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND d.goods_name  like concat('%', #{searchKey}, '%')
             ) >0)
         </if>
-        <if test="classStatus != null  ">
+        <if test="classStatus != null and  classStatus!=2">
             AND g.class_status =  #{classStatus}
         </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 !='' ">
             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>