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

app/models/graduation_work.rb

@@ -48,7 +48,7 @@ class GraduationWork < ApplicationRecord
 
   def delete_atta atta
     last_score = graduation_work_scores.where.not(score: nil).last
-    (atta.author_id == self.user_id) && (last_score.blank? || last_score.try(:created_at) < atta.created_on)
+    (atta.author_id == User.current.id) && (last_score.blank? || last_score.try(:created_at) < atta.created_on)
   end
 
   # 分班名

app/models/student_work.rb

@@ -106,7 +106,7 @@ class StudentWork < ApplicationRecord
 
   def delete_atta atta
     last_score = student_works_scores.where.not(score: nil).last
-    (atta.author_id == self.user_id) && (last_score.blank? || last_score.try(:created_at) < atta.created_on)
+    (atta.author_id == User.current.id) && (last_score.blank? || last_score.try(:created_at) < atta.created_on)
   end
 
   # 作品总体评价

app/services/ecs/import_student_service.rb

@@ -11,10 +11,10 @@ class Ecs::ImportStudentService < ApplicationService
   def call
     raise Error, '文件不存在' if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
 
-    excel = Ecs::ImportStudentExcel.new(params[:file].to_path)
+    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

@@ -53,12 +53,12 @@
           <td><span class="apply-status-<%= apply.status %>"><%= apply.status_text %></span></td>
         <% else %>
           <td class="action-container">
-            <%= agree_link '同意', agree_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}"), 'data-confirm': '确认审核通过？' %>
+            <%= agree_link '同意', agree_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}"), 'data-confirm': '确认审核通过？', 'data-disable-with': "提交中..." %>
             <%= 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': "拒绝中...") %>
           </td>
         <% end %>
       </tr>