floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-16 17:55:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request '修复数据问题，新增开启中的工作项数量返回' (#258) from KingChan/forgeplus:pm_project_develop into pm_project_develop

Browse Source
This commit is contained in:
KingChan
2024-01-30 11:00:06 +08:00
parent b6b81b6092 3505d29410
commit 0e72e11275
2 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/controllers/api/pm/projects_controller.rb
View File

@@ -65,10 +65,8 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController
def polyline
return tip_exception '参数错误' if params[:pm_project_id].blank?
time_line = (Time.current.beginning_of_day - 6.day) .. Time.current
# @create_issues = Issue.where(pm_project_id: params[:pm_project_id],created_on: time_line)
# @due_issues = Issue.where(pm_project_id: params[:pm_project_id],due_date: time_line)
@create_issues = Issue.where(pm_project_id: 135,created_on: time_line)
@due_issues = Issue.where(pm_project_id: 135,due_date: time_line)
@create_issues = Issue.where(pm_project_id: params[:pm_project_id],created_on: time_line)
@due_issues = Issue.where(pm_project_id: params[:pm_project_id],due_date: time_line)
@create_issues_count = @create_issues.group(:pm_issue_type,"DATE(created_on)").count
@due_issues_count = @due_issues.group(:pm_issue_type,"DATE(due_date)").count
data = {
@@ -77,17 +75,20 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController
}
7.times do |time|
current_time = Date.current - time.day
data[:create_issues][current_time] = {
"1": @create_issues_count[[1,current_time]] || 0,
"2": @create_issues_count[[2,current_time]] || 0,
"3": @create_issues_count[[3,current_time]] || 0
}
data[:due_issues][current_time] = {
"1": @due_issues_count[[1,current_time]] || 0,
"2": @due_issues_count[[2,current_time]] || 0,
"3": @due_issues_count[[3,current_time]] || 0
}
if @create_issues_count.present?
data[:create_issues][current_time] = {
"1": @create_issues_count[[1,current_time]] || 0,
"2": @create_issues_count[[2,current_time]] || 0,
"3": @create_issues_count[[3,current_time]] || 0
}
end
if @due_issues_count.present?
data[:due_issues][current_time] = {
"1": @due_issues_count[[1,current_time]] || 0,
"2": @due_issues_count[[2,current_time]] || 0,
"3": @due_issues_count[[3,current_time]] || 0
}
end
end
render_ok(data: data)
end