From 9e720b3d00ac61573eb97ab3987fbd7bcb3e639b Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Wed, 3 Jul 2019 12:24:09 +0800
Subject: [PATCH] fix bug

---
 .../graduation_tasks_controller.rb            |  9 ++++----
 .../graduation_topics_controller.rb           |  2 +-
 .../homework_commons_controller.rb            | 23 +++++++++++++------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/controllers/graduation_tasks_controller.rb b/app/controllers/graduation_tasks_controller.rb
index 23344e7fc..a518ac954 100644
--- a/app/controllers/graduation_tasks_controller.rb
+++ b/app/controllers/graduation_tasks_controller.rb
@@ -130,11 +130,10 @@ class GraduationTasksController < ApplicationController
         elsif @work_count == 0
           normal_status(-1,"暂无提交的学生！")
         else
-          student_work_to_xlsx(@work_excel,@homework)
-          exercise_export_name = current_user.real_name + "_" + @course.name + "_" + @homework.name + "_" + Time.now.strftime('%Y%m%d_%H%M%S')
 
-          render xlsx: "#{exercise_export_name.strip.first(30)}",template: "homework_commons/works_list.xlsx.axlsx",locals:
-              {table_columns: @work_head_cells,task_users: @work_cells_column}
+          graduation_work_to_xlsx(@work_excel,@task,current_user)
+          exercise_export_name = "#{current_user.real_name}_#{@course.name}_#{@task.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
+          render xlsx: "#{exercise_export_name.strip.first(30)}",template: "graduation_tasks/tasks_list.xlsx.axlsx",locals: {table_columns:@head_cells_column, task_users:@task_cells_column}
         end
       elsif params[:format] == "zip"
         if @user_course_identity >= Course::STUDENT
@@ -143,7 +142,7 @@ class GraduationTasksController < ApplicationController
           zip_works = @work_excel.where("work_status > 0")
           status = checkfileSize(zip_works)
           if status == 0
-            zipfile = zip_homework_common @homework, zip_works
+            zipfile = zip_homework_common @task, zip_works
             file = decode64(zipfile[0][:base64file])
             send_file "#{OUTPUT_FOLDER}/#{file}", filename: filename_for_content_disposition(file), type: 'application/zip'
           else
diff --git a/app/controllers/graduation_topics_controller.rb b/app/controllers/graduation_topics_controller.rb
index c611069a8..2c9132520 100644
--- a/app/controllers/graduation_topics_controller.rb
+++ b/app/controllers/graduation_topics_controller.rb
@@ -269,7 +269,7 @@ class GraduationTopicsController < ApplicationController
     course = @course
     students = course.students.joins(user: :user_extension).order("user_extensions.student_id")
     graduation_topic_to_xlsx(students,course)
-    exercise_export_name = current_user.real_name + "_" + course.name + "_毕设选题" + "_" + Time.now.strftime('%Y%m%d_%H%M%S')
+    exercise_export_name = "#{current_user.real_name}_#{course.name}_毕设选题_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
     render xlsx: "#{exercise_export_name.strip.first(30)}",template: "graduation_topics/export.xlsx.axlsx",locals: {table_columns:@topic_head_cells,topic_users:@topic_body_cells}
   end
 
diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 6cffa866d..50ec4f7db 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -208,11 +208,16 @@ class HomeworkCommonsController < ApplicationController
         elsif @work_count == 0
           normal_status(-1,"暂无提交的学生！")
         else
-          student_work_to_xlsx(@work_excel,@homework)
-          exercise_export_name = current_user.real_name + "_" + @course.name + "_" + @homework.name + "_" + Time.now.strftime('%Y%m%d_%H%M%S')
+          respond_to do |format|
+            format.xlsx{
+              student_work_to_xlsx(@work_excel,@homework)
+              exercise_export_name = current_user.real_name + "_" + @course.name + "_" + @homework.name + "_" + Time.now.strftime('%Y%m%d_%H%M%S')
+
+              render xlsx: "#{exercise_export_name.strip.first(30)}",template: "homework_commons/works_list.xlsx.axlsx",locals:
+                  {table_columns: @work_head_cells,task_users: @work_cells_column}
+            }
+          end
 
-          render xlsx: "#{exercise_export_name.strip.first(30)}",template: "homework_commons/works_list.xlsx.axlsx",locals:
-              {table_columns: @work_head_cells,task_users: @work_cells_column}
         end
       elsif params[:format] == "zip"
         if @user_course_identity >= Course::STUDENT
@@ -221,9 +226,13 @@ class HomeworkCommonsController < ApplicationController
           zip_works = @work_excel.where("work_status > 0")
           status = checkfileSize(zip_works)
           if status == 0
-            zipfile = zip_homework_common @homework, zip_works
-            file = decode64(zipfile[0][:base64file])
-            send_file "#{OUTPUT_FOLDER}/#{file}", filename: filename_for_content_disposition(file), type: 'application/zip'
+            respond_to do |format|
+              format.zip{
+                zipfile = zip_homework_common @homework, zip_works
+                file = decode64(zipfile[0][:base64file])
+                send_file "#{OUTPUT_FOLDER}/#{file}", filename: filename_for_content_disposition(file), type: 'application/zip'
+              }
+            end
           else
             tip_exception(status == -2 ? "500M" : "无附件可下载")
           end