floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-03 03:40:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

更改：统计工作项容量以及预估工时

Browse Source
This commit is contained in:
yystopf
2023-12-01 09:19:08 +08:00
parent fe4f56dd36
commit 93514e8a73
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ class Api::V1::Issues::ListService < ApplicationService
attr_reader :begin_date, :end_date
attr_reader :milestone_id, :assigner_id, :status_id, :sort_by, :sort_direction, :current_user
attr_reader :pm_project_id, :pm_sprint_id, :root_id, :pm_issue_type, :status_ids
attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count
attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count, :complete_issues_count
validates :category, inclusion: { in: %w[all opened closed], message: '请输入正确的Category'}
validates :participant_category, inclusion: { in: %w[all aboutme authoredme assignedme atme], message: '请输入正确的ParticipantCategory'}
@@ -41,7 +41,13 @@ class Api::V1::Issues::ListService < ApplicationService
# begin
issue_query_data
{data: queried_issues, total_issues_count: @total_issues_count, closed_issues_count: @closed_issues_count, opened_issues_count: @opened_issues_count}
{
data: queried_issues,
total_issues_count: @total_issues_count,
closed_issues_count: @closed_issues_count,
opened_issues_count: @opened_issues_count,
complete_issues_count: @complete_issues_count
}
# rescue
# raise Error, "服务器错误，请联系系统管理员！"
# end
@@ -108,6 +114,7 @@ class Api::V1::Issues::ListService < ApplicationService
@total_issues_count = issues.distinct.size
@closed_issues_count = issues.closed.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).size
case category
when 'closed'