新增:参数查询
This commit is contained in:
parent
1af1917579
commit
1c325f412f
|
@ -2,7 +2,9 @@ class Api::Pm::WeeklyIssuesController < ApplicationController
|
||||||
|
|
||||||
def personal
|
def personal
|
||||||
@enterprise_identifier = params[:enterprise_identifier] || ''
|
@enterprise_identifier = params[:enterprise_identifier] || ''
|
||||||
@all_issues = Issue.where(enterprise_identifier: @enterprise_identifier, pm_issue_type: [1,2,3])
|
return render_error('请输入正确的用户ID.') if params[:user_id].blank?
|
||||||
|
@all_issues = Issue.joins(:issue_participants).where(issue_participants: {participant_id: params[:user_id], participant_type: ['authored', 'assigned']})
|
||||||
|
@all_issues = @all_issues.where(enterprise_identifier: @enterprise_identifier, pm_issue_type: [1,2,3])
|
||||||
@this_week_all_issues = @all_issues.where("due_date >= ? and start_date <= ?", Date.today.beginning_of_week.to_s, Date.today.end_of_week.to_s)
|
@this_week_all_issues = @all_issues.where("due_date >= ? and start_date <= ?", Date.today.beginning_of_week.to_s, Date.today.end_of_week.to_s)
|
||||||
@this_week_all_issues = @this_week_all_issues.order('created_on desc')
|
@this_week_all_issues = @this_week_all_issues.order('created_on desc')
|
||||||
@next_week_all_issues = @all_issues.where("due_date >= ? and start_date <=?", (Date.today.beginning_of_week+1.week).to_s, (Date.today.end_of_week+1.week).to_s)
|
@next_week_all_issues = @all_issues.where("due_date >= ? and start_date <=?", (Date.today.beginning_of_week+1.week).to_s, (Date.today.end_of_week+1.week).to_s)
|
||||||
|
@ -18,6 +20,7 @@ class Api::Pm::WeeklyIssuesController < ApplicationController
|
||||||
def group
|
def group
|
||||||
@enterprise_identifier = params[:enterprise_identifier] || ''
|
@enterprise_identifier = params[:enterprise_identifier] || ''
|
||||||
@all_issues = Issue.where(enterprise_identifier: @enterprise_identifier, pm_issue_type: [1,2,3])
|
@all_issues = Issue.where(enterprise_identifier: @enterprise_identifier, pm_issue_type: [1,2,3])
|
||||||
|
@all_issues = @all_issues.where(pm_project_id: params[:pm_project_ids].split(",")) if params[:pm_project_ids].present?
|
||||||
@this_week_all_issues = @all_issues.where("due_date >= ? and start_date <= ?", Date.today.beginning_of_week.to_s, Date.today.end_of_week.to_s)
|
@this_week_all_issues = @all_issues.where("due_date >= ? and start_date <= ?", Date.today.beginning_of_week.to_s, Date.today.end_of_week.to_s)
|
||||||
@this_week_all_issues_group_count = @this_week_all_issues.group(:pm_project_id).count
|
@this_week_all_issues_group_count = @this_week_all_issues.group(:pm_project_id).count
|
||||||
data = {}
|
data = {}
|
||||||
|
|
Loading…
Reference in New Issue