From 8c3927a06b09e9722264b128b269573cdcbd8387 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 31 May 2019 17:56:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/zip_service.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/services/zip_service.rb b/app/services/zip_service.rb index 4d381e76..3cdeb2f6 100755 --- a/app/services/zip_service.rb +++ b/app/services/zip_service.rb @@ -50,10 +50,11 @@ module ZipService bid_homework_path = [] digests = [] members = exercise.course.members - exercise_users.each do |exercise_user| + exercise_users.each_with_index do |exercise_user, index| member = members.where(:user_id => exercise_user.user_id).first group_name = member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name - export_file_name = "#{group_name}-#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf" + # export_file_name = "#{group_name}-#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf" + export_file_name = "#{exercise.id}-#{exercise_user.user.user_extensions.student_id}-#{index}" + ".pdf" out_file = export_user_exercise(exercise, exercise_user, export_file_name) file_name = File::expand_path(out_file) From dedc46c0506d0628448b384cac6c7cd780405771 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 31 May 2019 18:04:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/zip_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/zip_service.rb b/app/services/zip_service.rb index 3cdeb2f6..5dd2caba 100755 --- a/app/services/zip_service.rb +++ b/app/services/zip_service.rb @@ -184,6 +184,7 @@ module ZipService def export_user_exercise exercise, exercise_user, file_name url = Setting.protocol + "://" + Setting.host_name + "/exercise/" + exercise.id.to_s + "/show_student_result?user_id=#{exercise_user.user_id}&pdf=1" + Rails.logger.info("#########################url: #{url}") kit = PDFKit.new(url, :page_size => "A4") # kit.to_pdf # inline PDF # file_name = "#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf" From 81ca2e10e8348e2c52f5476c4d859eb5d5d57957 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 31 May 2019 18:09:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/zip_service.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/zip_service.rb b/app/services/zip_service.rb index 5dd2caba..a4346214 100755 --- a/app/services/zip_service.rb +++ b/app/services/zip_service.rb @@ -53,8 +53,8 @@ module ZipService exercise_users.each_with_index do |exercise_user, index| member = members.where(:user_id => exercise_user.user_id).first group_name = member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name - # export_file_name = "#{group_name}-#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf" - export_file_name = "#{exercise.id}-#{exercise_user.user.user_extensions.student_id}-#{index}" + ".pdf" + export_file_name = "#{group_name}-#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf" + #export_file_name = "#{exercise.id}-#{exercise_user.user.user_extensions.student_id}-#{index}" + ".pdf" out_file = export_user_exercise(exercise, exercise_user, export_file_name) file_name = File::expand_path(out_file) @@ -193,8 +193,8 @@ module ZipService Rails.logger.info("###################file_name: #{file_name}") kit.to_file("#{OUTPUT_FOLDER}/#{file_name}") out_file = "#{OUTPUT_FOLDER}/#{file_name}" - out_file Rails.logger.info("#################out_file_file_name: #{out_file}") + out_file end def export_user_shixun_work homework, student_work, file_name From 496916b747d84dc9303ff7e49e91be9fbdc192bc Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 31 May 2019 18:10:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/zip_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/zip_service.rb b/app/services/zip_service.rb index a4346214..8be197f4 100755 --- a/app/services/zip_service.rb +++ b/app/services/zip_service.rb @@ -53,8 +53,8 @@ module ZipService exercise_users.each_with_index do |exercise_user, index| member = members.where(:user_id => exercise_user.user_id).first group_name = member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name - export_file_name = "#{group_name}-#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf" - #export_file_name = "#{exercise.id}-#{exercise_user.user.user_extensions.student_id}-#{index}" + ".pdf" + # export_file_name = "#{group_name}-#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf" + export_file_name = "#{exercise.id}-#{exercise_user.user.user_extensions.student_id}-#{index}" + ".pdf" out_file = export_user_exercise(exercise, exercise_user, export_file_name) file_name = File::expand_path(out_file)