Merge branch 'dev_aliyun' into dev_cxt

app/controllers/ecs/course_targets_controller.rb

@@ -19,7 +19,9 @@ class Ecs::CourseTargetsController < Ecs::CourseBaseController
   end
 
   def with_achievement_methods
-    @course_targets = current_course.ec_course_targets.includes(:ec_graduation_subitems, :ec_course_achievement_methods)
+    @course_targets = current_course.ec_course_targets
+                        .includes(:ec_graduation_subitems,
+                                  ec_course_achievement_methods: [:ec_course_evaluation, :ec_course_evaluation_subitems])
   end
 
   private

app/models/ec_course_evaluation.rb

@@ -11,6 +11,7 @@ class EcCourseEvaluation < ApplicationRecord
   enum score_type: { detail: 1, average: 2 }, _suffix: :score_type # :detail_score_type?, :average_score_type?
 
   accepts_nested_attributes_for :ec_course_evaluation_subitems, allow_destroy: true
+  alias_attribute :evaluation_count, :evluation_count
 
   def imported?
     import_status?

app/services/ecs/query_course_evaluation_service.rb

@@ -29,7 +29,7 @@ class Ecs::QueryCourseEvaluationService < ApplicationService
 
       support = subitem.ec_course_supports.find_by(ec_course_id: ec_course.id)
 
-      weight = support.weights.to_f
+      weight = support&.weights.to_f
       objective_achievement = (weight * ec_course.ec_year.calculation_value.to_f).round(3)
 
       target_total_rates = 0