Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/courses_controller.rb

@@ -212,7 +212,7 @@ class CoursesController < ApplicationController
 
         @course.update_attributes!(course_params.merge(extra_params))
         @course.update_course_modules(params[:course_module_types])
-
+        Rails.logger.info("###############course_update_end")
         normal_status(0, "成功")
       rescue => e
         uid_logger_error(e.message)
@@ -1484,8 +1484,10 @@ class CoursesController < ApplicationController
     shixun_titles = shixun_homeworks.pluck(:name) + ["总得分"]
 
     # 更新实训作业成绩
-    shixun_homeworks.includes(:homework_challenge_settings, :published_settings, :homework_commons_shixun).each do |homework|
-      homework.update_homework_work_score
+    unless course.is_end
+      shixun_homeworks.includes(:homework_challenge_settings, :published_settings, :homework_commons_shixun).each do |homework|
+        homework.update_homework_work_score
+      end
     end
 
     shixun_homeworks = shixun_homeworks&.includes(score_student_works: :user)

app/views/users/get_user_info.json.jbuilder

@@ -20,6 +20,7 @@ if @course
     json.group_info @course.teacher_group(@user.id) if @course_identity < Course::STUDENT
   end
   json.first_category_url module_url(@course.none_hidden_course_modules.first, @course)
+  json.course_is_end @course.is_end
 end
 
 if params[:school]