From 7d6d95c7eb343c077ff341ede76f783010580a97 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 11:01:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8\=E7=82=B9=E8=B5=9E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 3 +++ app/controllers/watchers_controller.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4724224e8..0ece8f227 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -293,7 +293,10 @@ class ProjectsController < ApplicationController end def praise_users + start_at = params[:start_at] + end_at = params[:end_at] praises = @project.praise_treads.includes(:user).order("praise_treads.created_at desc").distinct + praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @praises_count = praises.size @praises = paginate(praises) end diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index aa3642616..81ba7ceda 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -5,7 +5,10 @@ class WatchersController < ApplicationController before_action :get_target def index + start_at = params[:start_at] + end_at = params[:end_at] scope = @target.watchers.includes(:user) + scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? @watchers = paginate(scope) end