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

app/models/student_work.rb

@@ -228,6 +228,11 @@ class StudentWork < ApplicationRecord
     shixun_work_comments.size > 0 || student_works_scores.size > 0 || challenge_work_scores.size > 0
   end
 
+  # 普通/分组作品是否已被评阅过
+  def work_has_comment?
+    student_works_scores.select{|score| score.reviewer_role < 3}.size > 0
+  end
+
   def scored?
     student_works_scores.where.not(reviewer_role: 3, score: nil).exists?
   end

app/views/homework_commons/works_list.json.jbuilder

@@ -103,6 +103,7 @@ if @homework.homework_type == "practice"
     json.efficiency work_score_format(work.efficiency, @current_user == work.user, @score_open)
     json.eff_score work_score_format(work.eff_score, @current_user == work.user, @score_open)
 
+    json.myshixun_identifier work.myshixun&.identifier
     json.cost_time work.myshixun.try(:total_spend_time)
     json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late
     end_time = @homework.allow_late ? @homework.late_time : @homework.homework_group_setting(work.user_id)&.end_time
@@ -175,7 +176,7 @@ elsif @homework.homework_type == "group" || @homework.homework_type == "normal"
     json.user_login @is_evaluation ?  "--" : work.user.try(:login)
     json.user_name @is_evaluation ? "匿名" : work.user.try(:real_name)
     json.user_img @is_evaluation ? "--" : url_to_avatar(work.user)
-
+    json.has_comment work.work_has_comment?
   end
 end