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

app/models/tiding.rb

@@ -22,4 +22,10 @@ class Tiding < ApplicationRecord
 
     value
   end
+
+  def anonymous?
+    (container_type == 'StudentWorksScore' && extra.to_i == 3) ||
+      (container_type == 'StudentWorksScoresAppeal' && parent_container_type == 'AppealResult') ||
+      (container_type == 'StudentWorksScoresAppeal' && parent_container_type == 'StudentWork' && tiding_type == 'System')
+  end
 end

app/views/tidings/_tiding.json.jbuilder

@@ -17,8 +17,13 @@ json.homework_type homework_type
 json.time tiding.how_long_time
 json.new_tiding tiding.unread?(@onclick_time)
 
+# 需要系统头像
+show_system_user = tiding.trigger_user_id.zero? ||
+  (tiding.trigger_user_id == 1 && tiding.tiding_type == 'System') ||
+  tiding.anonymous?
+
 json.trigger_user do
-  if tiding.trigger_user_id.zero? || (tiding.trigger_user_id == 1 && tiding.tiding_type == 'System')
+  if show_system_user
     json.id 0
     json.name "系统"
     json.login ""

lib/tasks/public_course_sync.rake

@@ -81,8 +81,10 @@ namespace :public_classes do
 
         homework.update_columns(publish_time: publish_time, end_time: end_time, created_at: created_at, updated_at: updated_at)
         homework.homework_detail_manual.update_columns(comment_status: 6, created_at: created_at, updated_at: updated_at)
+        homework.update_homework_work_score
+        homework.update_attribute('calculation_time', end_time)
 
-        homework.student_works.where("work_status !=0 and update_time > '#{end_time}'").update_all(update_time: end_time)
+        # homework.student_works.where("work_status !=0 and update_time > '#{end_time}'").update_all(update_time: end_time)
       end
     when 3
       # 试卷