From 1523b992e0636d07090a856f3f05d53d3390558a Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Wed, 5 Jun 2019 13:57:04 +0800
Subject: [PATCH] modify school management view

---
 app/views/managements/schools/_data_contrast_list.html.erb | 4 ++--
 app/views/managements/schools/_data_grow_list.html.erb     | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/views/managements/schools/_data_contrast_list.html.erb b/app/views/managements/schools/_data_contrast_list.html.erb
index 88eb4c6b..c25a8bc4 100644
--- a/app/views/managements/schools/_data_contrast_list.html.erb
+++ b/app/views/managements/schools/_data_contrast_list.html.erb
@@ -21,8 +21,8 @@
     <th width="6%">序号</th>
     <th width="10%">ID</th>
     <th width="20%" class="edu-txt-left">单位名称</th>
-    <th width="22%">时段一<br><%= "（#{params[:begin_date]} 05:00至#{params[:end_date]} 05:00）" %></th>
-    <th width="22%">时段二<br><%= "（#{params[:other_begin_date]} 05:00至#{params[:other_end_date]} 05:00）" %></th>
+    <th width="22%">时段一<br><%= "（#{params[:begin_date]} 05:00至#{(Time.zone.parse(params[:end_date]) + 1.days).strftime('%Y-%m-%d')} 05:00）" %></th>
+    <th width="22%">时段二<br><%= "（#{params[:other_begin_date]} 05:00至#{(Time.zone.parse(params[:other_end_date]) + 1.days).strftime('%Y-%m-%d')} 05:00）" %></th>
     <th width="20%" colspan="2">
       <%= sort_tag('变化情况', name: 'percentage', path: school_data_contrast_managements_path) %>
       <br>（  新  增  数   | 新增百分比）
diff --git a/app/views/managements/schools/_data_grow_list.html.erb b/app/views/managements/schools/_data_grow_list.html.erb
index 81976044..af1fc200 100644
--- a/app/views/managements/schools/_data_grow_list.html.erb
+++ b/app/views/managements/schools/_data_grow_list.html.erb
@@ -1,12 +1,7 @@
 <div style="background-color: #fafafa;">
   统计总计：
   <% if params[:grow_begin_date].present? %>
-    <% if params[:grow_begin_date] == params[:grow_end_date] %>
-      <%= Time.zone.parse(params[:grow_begin_date]).beginning_of_day.strftime('%Y-%m-%d') %> 05:00至
-      <%= (Time.zone.parse(params[:grow_begin_date]).beginning_of_day + 1.days).strftime('%Y-%m-%d') %> 05:00
-    <% else %>
-      <%= params[:grow_begin_date] %> 05:00至<%= (Time.zone.parse(params[:grow_end_date]) + 1.days).strftime('%Y-%m-%d') %> 05:00
-    <% end %>
+    <%= params[:grow_begin_date] %> 05:00至<%= (Time.zone.parse(params[:grow_end_date]) + 1.days).strftime('%Y-%m-%d') %> 05:00
   <% else %>
     <%= (Time.current - 5.hour).beginning_of_day.ago(1.days).strftime('%Y-%m-%d') %> 05:00至
     <%= (Time.current - 5.hour).beginning_of_day.strftime('%Y-%m-%d') %> 05:00，