Merge branches 'dev_Ysm' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

lib/tasks/excellent_course_exercise.rake

@@ -35,9 +35,9 @@ namespace :excellent_course_exercise do
     members.each_with_index do |member, index|
       exercise_user = exercise.exercise_users.where(user_id: member.user_id).take
       if exercise_question_ids.length == 20
-        rand_num = index < pass_count - 1 ? 20 : rand(1..16)
+        rand_num = index < pass_count - 1 ? rand(15..20) : rand(1..10)
       elsif exercise_question_ids.length == 17
-        rand_num = index < pass_count - 1 ? rand(13..17) : rand(1..11)
+        rand_num = index < pass_count - 1 ? rand(12..17) : rand(1..9)
       elsif exercise_question_ids.length == 39
         rand_num = index < pass_count - 1 ? rand(30..39) : rand(1..18)
       else

lib/tasks/public_course.rake

@@ -48,27 +48,17 @@ namespace :public_course do
     end
   end
 
-  #
-  task :message => :environment do
-    discusses = Discuss.find_by_sql("select content, user_id, created_on, updated_on from discusses where dis_id in (select shixun_id from stage_shixuns where
-                                   stage_id in (select id from stages where subject_id=#{subject_id})) and created_at > #{start_time} and
-                                   created_at<#{end_time}")
-    discusses.find_each do |discuss|
-      puts discuss.user_id
-      puts discuss.content
-      # 回复帖子
-      # 讨论区发布帖子
-      # Message.create!(board: @message.board, root_id: @message.root_id || @message.id,
-      #                 author: current_user, parent: @message,
-      #                 message_detail_attributes: {
-      #                     content: params[:content]
-      #                 })
+  task :test_user => :environment do
+    users = User.where(is_test: true)
+    users.find_each do |user|
+      puts user.id
+      CourseMember.create!(course_id: course_id, user_id: user.id, role: 4)
     end
   end
 
 
   # 更新某个课程的某类时间
-  # 执行示例  bundle exec rake public_course:student args=2903,1
+  # 执行示例  bundle exec rake public_course:time args=-1,2932,1,1
   task :time => :environment do
     # course_id = ENV['args'].split(",")[0] # 对应课堂的id
     # type = ENV['args'].split(",")[1]
@@ -78,6 +68,11 @@ namespace :public_course do
     case type.to_i
     when 1
       # 讨论区
+      created_on = random_time start_time, end_time
+      messages = Message.where(board_id: course.boards)
+      message_details = MessageDetail.where(message_id: messages)
+      messages.update_columns(created_on: created_on, updated_on: created_on)
+      message_details.update_columns(created_at: created_on, updated_at: created_on)
 
     when 2
       # 作业