he2802 1 year ago
parent
commit
8e137e6ae4

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

@@ -1349,9 +1349,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND u.realname  like concat('%', #{userName}, '%')
             ) >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>