Merge pull request '调整折线图数据' (#266) from KingChan/forgeplus:pm_project_develop into pm_project_develop
This commit is contained in:
commit
34d00a9c6d
|
@ -72,7 +72,8 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController
|
|||
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: 179,created_on: time_line)
|
||||
@due_issues = Issue.where(pm_project_id: params[:pm_project_id],status_id:[3,5],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 = {
|
||||
|
|
Loading…
Reference in New Issue