From d2d0c263d7b3092fc4766234b7aa9f966e7f9477 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 27 Sep 2016 12:08:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AEissue?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E7=9A=84=E6=97=B6=E9=97=B4=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E6=A0=BC=E5=BC=8F=E5=8F=8A=E7=9B=AE=E6=A0=87=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 95125cd11..8563f6f02 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -102,7 +102,7 @@ module ApplicationHelper
     sheet1 = book.create_worksheet :name => "issues"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
-    sheet1.row(0).concat([l(:issue_xls_id),l(:issue_xls_tracker_id),l(:issue_xls_title),l(:issue_xls_description),l(:issue_xls_status),l(:issue_xls_assign),l(:issue_xls_priority),l(:issue_xls_author),l(:issue_xls_created_at),l(:issue_xls_version),l(:issue_xls_start),l(:issue_xls_due),l(:issue_xls_ratio)])
+    sheet1.row(0).concat([l(:issue_xls_id),l(:issue_xls_tracker_id),l(:issue_xls_title),l(:issue_xls_description),l(:issue_xls_status),l(:issue_xls_assign),l(:issue_xls_priority),l(:issue_xls_author),l(:issue_xls_created_at),l(:milestone),l(:issue_xls_start),l(:issue_xls_due),l(:issue_xls_ratio)])
     count_row = 1
     issues.each do |issue|
       sheet1[count_row,0] = issue.id
@@ -113,10 +113,10 @@ module ApplicationHelper
       sheet1[count_row,5] = issue.assigned_to.try(:show_name)
       sheet1[count_row,6] = issue_priority_change(issue.priority_id)
       sheet1[count_row,7] = issue.author.show_name
-      sheet1[count_row,8] = issue.created_on
+      sheet1[count_row,8] = issue.created_on.nil? ? issue.created_on : issue.created_on.strftime('%Y-%m-%d %H:%M:%S')
       sheet1[count_row,9] = issue.fixed_version.try(:name)
-      sheet1[count_row,10] = issue.start_date
-      sheet1[count_row,11] = issue.due_date
+      sheet1[count_row,10] = issue.start_date.nil? ? issue.start_date :  issue.start_date.strftime('%Y-%m-%d')
+      sheet1[count_row,11] = issue.due_date.nil? ? issue.due_date : issue.due_date.strftime('%Y-%m-%d')
       sheet1[count_row,12] = issue_ratio_change(issue.done_ratio, issue.status_id)
       count_row += 1
     end