From ed81ce592748f038e4ad0c806709b6897834aac6 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 16 Jan 2024 16:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=B4=BB=E8=B7=83?=
 =?UTF-8?q?=E5=BA=A6=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/issues_rank_controller.rb        | 4 ++--
 app/controllers/admins/projects_rank_controller.rb      | 4 ++--
 app/views/admins/issues_rank/index.html.erb             | 4 ++--
 app/views/admins/issues_rank/shared/_data_list.html.erb | 2 +-
 app/views/admins/projects_rank/index.html.erb           | 4 ++--
 app/views/admins/shared/_sidebar.html.erb               | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/admins/issues_rank_controller.rb b/app/controllers/admins/issues_rank_controller.rb
index 530678ad5..79450fbfb 100644
--- a/app/controllers/admins/issues_rank_controller.rb
+++ b/app/controllers/admins/issues_rank_controller.rb
@@ -11,11 +11,11 @@ class Admins::IssuesRankController < Admins::BaseController
 
   private 
   def begin_date 
-    params.fetch(:begin_date, (Date.today-7.days).to_s)
+    params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
   end
 
   def end_date 
-    params.fetch(:end_date, Date.today.to_s)
+    params.fetch(:end_date, Date.yesterday.to_s)
   end
 
   def sort_by
diff --git a/app/controllers/admins/projects_rank_controller.rb b/app/controllers/admins/projects_rank_controller.rb
index e4d8046e0..8db0961b7 100644
--- a/app/controllers/admins/projects_rank_controller.rb
+++ b/app/controllers/admins/projects_rank_controller.rb
@@ -17,11 +17,11 @@ class Admins::ProjectsRankController < Admins::BaseController
   private 
 
   def begin_date 
-    params.fetch(:begin_date, (Date.today-7.days).to_s)
+    params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
   end
 
   def end_date 
-    params.fetch(:end_date, Date.today.to_s)
+    params.fetch(:end_date, Date.yesterday.to_s)
   end
 
   def sort_by
diff --git a/app/views/admins/issues_rank/index.html.erb b/app/views/admins/issues_rank/index.html.erb
index b52076966..4fc56ada9 100644
--- a/app/views/admins/issues_rank/index.html.erb
+++ b/app/views/admins/issues_rank/index.html.erb
@@ -7,11 +7,11 @@
   <%= form_tag(admins_issues_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'issue-rank-date-form') do %>
     <div class="input-group">
       <span class="input-group-text">开始日期</span>
-      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.today - 7.days).to_s%>" aria-label="选择日期">
+      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.yesterday - 7.days).to_s%>" aria-label="选择日期">
     </div>
     <div class="input-group">
       <span class="input-group-text">截止日期</span>
-      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.today.to_s%>" aria-label="选择日期">
+      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.yesterday.to_s%>" aria-label="选择日期">
     </div>
   <% end %>
 </div>
diff --git a/app/views/admins/issues_rank/shared/_data_list.html.erb b/app/views/admins/issues_rank/shared/_data_list.html.erb
index 8e9068345..9512028c3 100644
--- a/app/views/admins/issues_rank/shared/_data_list.html.erb
+++ b/app/views/admins/issues_rank/shared/_data_list.html.erb
@@ -19,7 +19,7 @@
           </td>
           <td><%= item&.issues %></td>
           <td><%= item&.closed_issues %></td>
-          <td><%= item&.issues_count %></td>
+          <td><%= item&.project&.issues&.issue_issue.count %></td>
         </tr>
       <% end %>
     </tbody>
diff --git a/app/views/admins/projects_rank/index.html.erb b/app/views/admins/projects_rank/index.html.erb
index e8f334f05..2e33a5335 100644
--- a/app/views/admins/projects_rank/index.html.erb
+++ b/app/views/admins/projects_rank/index.html.erb
@@ -7,11 +7,11 @@
   <%= form_tag(admins_projects_rank_index_path, method: :get, class: 'form-inline search-form flex-1', id: 'project-rank-date-form') do %>
     <div class="input-group">
       <span class="input-group-text">开始日期</span>
-      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.today - 7.days).to_s%>" aria-label="选择日期">
+      <input class="form-control datetimepicker" type="text" name="begin_date" value="<%= params[:begin_date] || (Date.yesterday - 7.days).to_s%>" aria-label="选择日期">
     </div>
     <div class="input-group">
       <span class="input-group-text">截止日期</span>
-      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.today.to_s%>" aria-label="选择日期">
+      <input class="form-control datetimepicker" type="text" name="end_date" value="<%= params[:end_date] || Date.yesterday.to_s%>" aria-label="选择日期">
     </div>
   <% end %>
   <%= link_to '导出', "/项目活跃度排行.xls", class: 'btn btn-primary mr-3' %>    
diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index ac09e3732..f9bf9ae48 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -81,7 +81,7 @@
       <%= sidebar_item_group('#rank-submenu', '活跃度排行', icon: 'calendar') do %>
         <li><%= sidebar_item(admins_users_rank_index_path, '用户活跃度排行', icon: 'user', controller: 'admins-users_rank') %></li>
         <li><%= sidebar_item(admins_projects_rank_index_path, '项目活跃度排行', icon: 'database', controller: 'admins-projects_rank') %></li>
-        <li><%= sidebar_item(admins_issues_rank_index_path, '疑修活跃度排行', icon: 'database', controller: 'admins-issues_rank') %></li>
+        <li><%= sidebar_item(admins_issues_rank_index_path, '疑修活跃度排行', icon: 'calendar', controller: 'admins-issues_rank') %></li>
       <% end %>
     </li>