diff --git a/app/controllers/api/pm/sprint_issues_controller.rb b/app/controllers/api/pm/sprint_issues_controller.rb index 0ae86ca9b..e443fcc0c 100644 --- a/app/controllers/api/pm/sprint_issues_controller.rb +++ b/app/controllers/api/pm/sprint_issues_controller.rb @@ -19,6 +19,7 @@ class Api::Pm::SprintIssuesController < Api::Pm::BaseController @issues_pm_type_count = @issues.group(:pm_sprint_id, :pm_issue_type).count @issues_hour_count = @issues.group(:pm_sprint_id).sum(:time_scale) @issues_hour_type_count = @issues.group(:pm_sprint_id, :status_id).sum(:time_scale) + @issues_hour_pm_type_count = @issues.group(:pm_sprint_id, :pm_issue_type).sum(:time_scale) pm_sprint_ids.map(&:to_i).map do |sprint_id| # count_closed 工作项已完成/已关闭数量,需排除已修复的缺陷数量 count_closed = @issues_type_count[[sprint_id, 5]].to_i + @issues_type_count[[sprint_id, 3]].to_i - @issues.where(pm_sprint_id: sprint_id, pm_issue_type: 3, status_id: 3).size @@ -31,7 +32,11 @@ class Api::Pm::SprintIssuesController < Api::Pm::BaseController hour_closed: hour_closed || 0, requirement: @issues_pm_type_count[[sprint_id, 1]] || 0, task: @issues_pm_type_count[[sprint_id, 2]] || 0, - bug: @issues_pm_type_count[[sprint_id, 3]] || 0 + bug: @issues_pm_type_count[[sprint_id, 3]] || 0, + requirement_hour: @issues_hour_pm_type_count[[sprint_id, 1]] || 0, + task_hour: @issues_hour_pm_type_count[[sprint_id, 2]] || 0, + bug_hour: @issues_hour_pm_type_count[[sprint_id, 3]] || 0 + } end render_ok(data: data)