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

app/services/ecs/import_student_service.rb

@@ -14,7 +14,7 @@ class Ecs::ImportStudentService < ApplicationService
     excel = Ecs::ImportStudentExcel.new(params[:file].path)
 
     success_count = 0
-    EcYearStudent.bulk_insert(:student_id, :name, :created_at, :updated_at) do |worker|
+    EcYearStudent.bulk_insert(:ec_year_id, :student_id, :name, :created_at, :updated_at) do |worker|
       excel.read_each do |student_id, name|
         success_count += 1
 
@@ -24,7 +24,7 @@ class Ecs::ImportStudentService < ApplicationService
           next
         end
 
-        worker.add(student_id: student_id, name: name)
+        worker.add(ec_year_id: ec_year.id, student_id: student_id, name: name)
       end
     end
 

app/views/admins/professional_authentications/shared/_list.html.erb

@@ -57,8 +57,8 @@
             <%= javascript_void_link('拒绝', class: 'action refuse-action',
                                      data: {
                                          toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id,
-                                         url: refuse_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}", 'data-disable-with': "拒绝中...")
+                                         url: refuse_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}")
-                                     }) %>
+                                     }, 'data-disable-with': "拒绝中...") %>
           </td>
         <% end %>
       </tr>