From be9b8e61c1ecc96f934b59f97d367271d9c74002 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 24 Aug 2019 14:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/subject.rb                 | 5 +++++
 app/views/subjects/show.json.jbuilder | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/models/subject.rb b/app/models/subject.rb
index 96d060353..7b671cfb1 100644
--- a/app/models/subject.rb
+++ b/app/models/subject.rb
@@ -39,6 +39,11 @@ class Subject < ApplicationRecord
     courses.pluck(:end_date).max
   end
 
+  # 是否有已开课的课堂
+  def has_course_start?
+    courses.where("start_date <= '#{Date.today}' and end_date >= '#{Date.today}'").count > 0
+  end
+
   # 挑战过路径的成员数(金课统计去重后的报名人数)
   def member_count
     excellent && CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length > shixuns.pluck(:myshixuns_count).sum ?
diff --git a/app/views/subjects/show.json.jbuilder b/app/views/subjects/show.json.jbuilder
index 53e76a96f..997e0c3d6 100644
--- a/app/views/subjects/show.json.jbuilder
+++ b/app/views/subjects/show.json.jbuilder
@@ -14,6 +14,7 @@ json.allow_add_member @is_manager
 json.is_creator @is_creator
 
 if @subject.excellent
+  json.has_start @subject.has_course_start?
   json.courses @courses do |course|
     json.course_id course.id
     json.first_category_url module_url(course.none_hidden_course_modules.first, course)