floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

修复:今日待办时间范围包括阈值

This commit is contained in:
yystopf 2025-01-17 14:01:09 +08:00
parent 2a77ac99d9
commit c94078831c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/pm/dashboards_controller.rb
View File

@ -7,7 +7,7 @@ class Api::Pm::DashboardsController < Api::Pm::BaseController
return render_error('请输入正确的pm_project_ids.') if params[:pm_project_ids].blank? return render_error('请输入正确的pm_project_ids.') if params[:pm_project_ids].blank?
pm_project_ids = params[:pm_project_ids].split(",") rescue [] pm_project_ids = params[:pm_project_ids].split(",") rescue []
date = params[:date].present? ? params[:date].to_date : Date.today rescue Date.today date = params[:date].present? ? params[:date].to_date : Date.today rescue Date.today
@issues = Issue.where("start_date < ? and due_date > ?", date, date) @issues = Issue.where("start_date <= ? and due_date >= ?", date, date)
@issues = @issues.where(pm_project_id: pm_project_ids).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'}) @issues = @issues.where(pm_project_id: pm_project_ids).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'})
@issues = kaminari_paginate(@issues.distinct.pm_includes) @issues = kaminari_paginate(@issues.distinct.pm_includes)
end end