Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/colleges_controller.rb

@@ -27,7 +27,7 @@ class CollegesController < ApplicationController
   def shixun_time
     time_sum = Game.joins('left join user_extensions on user_extensions.user_id = games.user_id')
                  .where(user_extensions: { school_id: current_school.id }).sum(:cost_time)
-    shixun_time_sum = (time_sum / (24 * 60 * 60.0)).ceil
+    shixun_time_sum = (time_sum / 60.0).ceil
 
     render json: { shixun_time: shixun_time_sum }
   end

app/controllers/courses_controller.rb

@@ -114,10 +114,10 @@ class CoursesController < ApplicationController
 
     #sql = "left join videos on videos.id=course_videos.video_id AND (videos.transcoded=1 OR videos.user_id = #{current_user.id})"
     #@videos = paginate videos.joins(sql).includes(video: [user: :user_extension], user: :user_extension)
-    videos = videos.joins(:video).select("course_videos.id, course_videos.title, course_videos.link, course_videos.is_link,course_videos.user_id, course_videos.video_id")
+    videos = videos.includes(video: [user: :user_extension],user: :user_extension).select("course_videos.id, course_videos.title, course_videos.link, course_videos.user_id")
     videos = videos.where(videos: {transcoded: true})
                  .or(videos.where(videos: {user_id: current_user.id}))
-                 .or(videos.where(course_videos: {is_link: true})).includes(video: [user: :user_extension], user: :user_extension)
+                 .or(videos.where(course_videos: {is_link: true}))
     @count = videos.count("course_videos.id")
     logger.info("#######count:#{@count}")
     @videos = paginate videos

app/jobs/student_join_attendance_record_job.rb

@@ -11,7 +11,7 @@ class StudentJoinAttendanceRecordJob < ApplicationJob
     group_ids = member.course_group_id == 0 ? [0] : [member.course_group_id, 0]
 
     current_attendance_ids = course.course_attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: group_ids}).
-      where("(attendance_date = '#{current_date}' and start_time <= '#{current_end_time}' and end_time > '#{current_end_time}') or (attendance_date > '#{current_date}')").pluck(:id)
+      where("(attendance_date = '#{current_date}' and end_time > '#{current_end_time}') or (attendance_date > '#{current_date}')").pluck(:id)
 
     all_group_attendance_ids = course.course_attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: 0}).pluck(:id)
     member.course_member_attendances.where.not(course_attendance_id: all_group_attendance_ids+current_attendance_ids).delete_all