更改:迭代工作项进度和工时容量接口合并
This commit is contained in:
parent
3a693b88c0
commit
0c48eeb52b
|
@ -8,33 +8,21 @@ class Api::Pm::SprintIssuesController < Api::Pm::BaseController
|
||||||
render 'api/v1/issues/index'
|
render 'api/v1/issues/index'
|
||||||
end
|
end
|
||||||
|
|
||||||
def count
|
def statistics
|
||||||
pm_sprint_ids = params[:pm_sprint_ids].split(",") rescue []
|
pm_sprint_ids = params[:pm_sprint_ids].split(",") rescue []
|
||||||
return tip_exception '参数错误' if pm_sprint_ids.blank?
|
return tip_exception '参数错误' if pm_sprint_ids.blank?
|
||||||
@issues = Issue.where(pm_sprint_id: pm_sprint_ids)
|
@issues = Issue.where(pm_sprint_id: pm_sprint_ids)
|
||||||
data = {}
|
data = {}
|
||||||
@issues_count = @issues.group(:pm_sprint_id).count
|
@issues_count = @issues.group(:pm_sprint_id).count
|
||||||
@issues_type_count = @issues.group(:pm_sprint_id, :status_id).count
|
@issues_type_count = @issues.group(:pm_sprint_id, :status_id).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)
|
||||||
pm_sprint_ids.map(&:to_i).map do |sprint_id|
|
pm_sprint_ids.map(&:to_i).map do |sprint_id|
|
||||||
data[sprint_id] = {
|
data[sprint_id] = {
|
||||||
total: @issues_count[sprint_id] || 0,
|
count_total: @issues_count[sprint_id] || 0,
|
||||||
closed: @issues_type_count[[sprint_id, 5]] || 0
|
count_closed: @issues_type_count[[sprint_id, 5]] || 0,
|
||||||
}
|
hour_total: @issues_hour_count[sprint_id] || 0,
|
||||||
end
|
hour_closed: @issues_hour_type_count[[sprint_id, 5]] || 0
|
||||||
render_ok(data: data)
|
|
||||||
end
|
|
||||||
|
|
||||||
def hour
|
|
||||||
pm_sprint_ids = params[:pm_sprint_ids].split(",") rescue []
|
|
||||||
return tip_exception '参数错误' if pm_sprint_ids.blank?
|
|
||||||
@issues = Issue.where(pm_sprint_id: pm_sprint_ids)
|
|
||||||
data = {}
|
|
||||||
@issues_count = @issues.group(:pm_sprint_id).sum(:time_scale)
|
|
||||||
@issues_type_count = @issues.group(:pm_sprint_id, :status_id).sum(:time_scale)
|
|
||||||
pm_sprint_ids.map(&:to_i).map do |sprint_id|
|
|
||||||
data[sprint_id] = {
|
|
||||||
total: @issues_count[sprint_id] || 0,
|
|
||||||
closed: @issues_type_count[[sprint_id, 5]] || 0
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
render_ok(data: data)
|
render_ok(data: data)
|
||||||
|
|
|
@ -23,8 +23,7 @@ defaults format: :json do
|
||||||
end
|
end
|
||||||
resources :sprint_issues, only: [:index] do
|
resources :sprint_issues, only: [:index] do
|
||||||
collection do
|
collection do
|
||||||
get :count
|
get :statistics
|
||||||
get :hour
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
resources :projects do
|
resources :projects do
|
||||||
|
|
Loading…
Reference in New Issue