Merge pull request '调整燃烬图' (#252) from KingChan/forgeplus:pm_project_develop into pm_project_develop
This commit is contained in:
commit
5a0c7cddcf
|
@ -13,14 +13,16 @@ class Api::Pm::SprintIssuesController < Api::Pm::BaseController
|
||||||
@issues = Issue.where(pm_sprint_id: params[:pm_sprint_id])
|
@issues = Issue.where(pm_sprint_id: params[:pm_sprint_id])
|
||||||
start_time = Date.parse params[:start_time]
|
start_time = Date.parse params[:start_time]
|
||||||
end_time = Date.parse params[:end_time]
|
end_time = Date.parse params[:end_time]
|
||||||
x = (end_time - start_time).to_i + 1 #计算间隔时间 加上最后一天
|
time_count = (end_time - start_time).to_i + 1 #计算间隔时间 加上最后一天
|
||||||
data = []
|
data = []
|
||||||
curren_issues = @issues.group(:status_id,:due_date).count
|
curren_issues = @issues.group(:status_id,:due_date).count
|
||||||
x.times do |time|
|
total_count = @issues.count
|
||||||
e_time = start_time + time
|
cardinality = (total_count / time_count).to_f
|
||||||
undone = curren_issues[[1,nil]].to_i + curren_issues[[1,e_time]].to_i + curren_issues[[2,e_time]].to_i + curren_issues[[3,e_time]].to_i
|
time_count.times do |x|
|
||||||
completed = curren_issues[[4,e_time]].to_i + curren_issues[[5,e_time]].to_i
|
e_time = start_time + x
|
||||||
data << {time: e_time, undone: undone, completed:completed}
|
completed = curren_issues[[5,e_time]].to_i + curren_issues[[3, e_time]].to_i - @issues.where(pm_issue_type: 3, status_id: 3).size
|
||||||
|
total_count = total_count - completed
|
||||||
|
data << {time: e_time, undone: total_count, completed:completed, base_number: (cardinality * (time_count - x))}
|
||||||
end
|
end
|
||||||
render_ok(data: data)
|
render_ok(data: data)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue