From 35ec3b1744a04a2185cb49740fe4162236f31719 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Sat, 27 Apr 2019 14:47:18 +0800
Subject: [PATCH] fix school data contrast percentage zero issue

---
 .../school_data_contrast_service.rb           |  8 +++---
 .../schools/_data_contrast_list.html.erb      | 27 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/services/management/school_data_contrast_service.rb b/app/services/management/school_data_contrast_service.rb
index 47c7f117..e6a39e9b 100644
--- a/app/services/management/school_data_contrast_service.rb
+++ b/app/services/management/school_data_contrast_service.rb
@@ -54,10 +54,8 @@ class Management::SchoolDataContrastService
   end
 
   def select_columns
-    "school_id, school_name, @total:=0, @other_total:=0,"\
-    "(@total:=SUM(IF(date BETWEEN '#{format_date(params[:begin_date])}' AND '#{format_date(params[:end_date])}', #{contrast_column}, 0))) total,"\
-    "(@other_total:=SUM(IF(date BETWEEN '#{format_date(params[:other_begin_date])}' AND '#{format_date(params[:other_end_date])}', #{contrast_column}, 0))) other_total,"\
-    "(IF(@other_total - @total = 0, 0.0, round((@other_total - @total) / IF(@total = 0, 1, @total), 5))) percentage,"\
-    "(@other_total - @total) increase"
+    "school_id, school_name,"\
+    "(SUM(IF(date BETWEEN '#{format_date(params[:begin_date])}' AND '#{format_date(params[:end_date])}', #{contrast_column}, 0))) total,"\
+    "(SUM(IF(date BETWEEN '#{format_date(params[:other_begin_date])}' AND '#{format_date(params[:other_end_date])}', #{contrast_column}, 0))) other_total"\
   end
 end
diff --git a/app/views/managements/schools/_data_contrast_list.html.erb b/app/views/managements/schools/_data_contrast_list.html.erb
index ae2ecfd2..af63aee8 100644
--- a/app/views/managements/schools/_data_contrast_list.html.erb
+++ b/app/views/managements/schools/_data_contrast_list.html.erb
@@ -14,10 +14,9 @@
     <th width="6%">序号</th>
     <th width="10%">ID</th>
     <th width="20%" class="edu-txt-left">单位名称</th>
-    <th width="24%">时段一<br><%= "（#{params[:begin_date]}至#{params[:end_date]}）" %></th>
-    <th width="24%">时段二<br><%= "（#{params[:other_begin_date]}至#{params[:other_end_date]}）" %></th>
-    <th width="16%" colspan="2">
-      <%#= sort_tag('变化情况', name: 'percentage', path: school_data_contrast_managements_path) %>
+    <th width="22%">时段一<br><%= "（#{params[:begin_date]}至#{params[:end_date]}）" %></th>
+    <th width="22%">时段二<br><%= "（#{params[:other_begin_date]}至#{params[:other_end_date]}）" %></th>
+    <th width="20%" colspan="2">
       变化情况
       <br>（  新  增  数   | 新增百分比）
     </th>
@@ -31,21 +30,25 @@
       <td class="edu-txt-left"><%= report.school_name %></td>
       <td><%= report['total'] %></td>
       <td><%= report['other_total'] %></td>
-      <% if report['increase'] > 0 %>
+      <%
+        increase = report['other_total'] - report['total']
+        percentage = report['total'].zero? ? increase.to_f * 100 : (increase / report['total'].to_f) * 100
+      %>
+      <% if increase > 0 %>
         <td class="edu-txt-right pr20 right-border" style="position: relative; color: red;">
-          +<%= report['increase'] %>
+          +<%= increase %>
         </td>
-        <td class="edu-txt-left pl20 c_red" style="color: red;">+<%= report['percentage'] %>%</td>
-      <% elsif report['increase'].zero? %>
+        <td class="edu-txt-left pl20 c_red" style="color: red;">+<%= percentage.round(5) %>%</td>
+      <% elsif increase.zero? %>
         <td class="edu-txt-right pr20 right-border" style="position: relative;">
-          <%= report['increase'] %>
+          <%= increase %>
         </td>
-        <td class="edu-txt-left pl20"><%= report['percentage'] %></td>
+        <td class="edu-txt-left pl20"><%= percentage.round(5) %>%</td>
       <% else %>
         <td class="edu-txt-right pr20 right-border c_green" style="position: relative; color: green;">
-          <%= report['increase'] %>
+          <%= increase %>
         </td>
-        <td class="edu-txt-left pl20" style="color: green;"><%= report['percentage'] %>%</td>
+        <td class="edu-txt-left pl20" style="color: green;"><%= percentage.round(5) %>%</td>
       <% end %>
     </tr>
   <% end %>