he2802 1 سال پیش
والد
کامیت
2a0edc3d9d
1فایلهای تغییر یافته به همراه3 افزوده شده و 1 حذف شده
  1. 3 1
      zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

+ 3 - 1
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1957,7 +1957,8 @@
             cgu.order_goods_id,
             cg.class_end_time,
             og.goods_id,
-            g.goods_name
+            g.goods_name,
+            cg.class_name as grade_name
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade cg on  cgu.grade_id = cg.grade_id
@@ -1967,6 +1968,7 @@
           and cg.status = 1
           and cgu.status = 1
           and cgu.user_id = #{userId}
+          and (cgu.period_status = -1 or cgu.period_status = 0)
           AND unix_timestamp(now()) BETWEEN cg.class_end_time-#{startTime} and cg.class_end_time-#{endTime}
     </select>