floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request '调整pm issue获取时的逻辑 获取总数' (#290) from KingChan/forgeplus:pm_project_develop into pm_project_develop

This commit is contained in:
KingChan 2024-05-30 12:25:14 +08:00
parent c87da2947f c590c29f29
commit ed4b4062e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/api/v1/issues/list_service.rb
View File

@ -64,7 +64,7 @@ class Api::V1::Issues::ListService < ApplicationService
private private
def issue_query_data def issue_query_data
issues = @project&.id.zero? ? Issue.issue_issue : @project.issues.issue_issue issues = @project&.id.zero? ? Issue.issue_issue : @project.issues.issue_issue
@total_issues_count = issues.distinct.size
case participant_category case participant_category
when 'aboutme' # 关于我的 when 'aboutme' # 关于我的
issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: %w[authored assigned atme], participant_id: participator&.id}) issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: %w[authored assigned atme], participant_id: participator&.id})
@ -154,7 +154,7 @@ class Api::V1::Issues::ListService < ApplicationService
# keyword # keyword
issues = issues.ransack(id_or_project_issues_index_eq: keyword).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present? issues = issues.ransack(id_or_project_issues_index_eq: keyword).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present?
@total_issues_count = issues.distinct.size
@closed_issues_count = issues.closed.distinct.size @closed_issues_count = issues.closed.distinct.size
@opened_issues_count = issues.opened.distinct.size @opened_issues_count = issues.opened.distinct.size
@complete_issues_count = issues.closed.distinct.size + issues.where(status_id: 3).distinct.size - issues.where(pm_issue_type: 3, status_id: 3).distinct.size @complete_issues_count = issues.closed.distinct.size + issues.where(status_id: 3).distinct.size - issues.where(pm_issue_type: 3, status_id: 3).distinct.size