From fe481f93294af9bbd2e811c6f5ac5d982409159f Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 25 Aug 2025 16:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Afull=5Fchild=5Fcount?= =?UTF-8?q?=E6=9D=A5=E8=B7=9F=E8=B8=AA=E5=AD=90=E5=B7=A5=E4=BD=9C=E9=A1=B9?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/issues_controller.rb | 1 + app/controllers/api/v1/issues_controller.rb | 1 + app/services/api/v1/issues/list_service.rb | 5 ++++- app/views/api/v1/issues/index.json.jbuilder | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb index 25cb88e81..1d004c57b 100644 --- a/app/controllers/api/pm/issues_controller.rb +++ b/app/controllers/api/pm/issues_controller.rb @@ -11,6 +11,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController @opened_issues_count = @object_result[:opened_issues_count] @closed_issues_count = @object_result[:closed_issues_count] @complete_issues_count = @object_result[:complete_issues_count] + @full_child_count = @object_result[:full_child_count] if params[:only_name].present? @issues = kaminary_select_paginate( @object_result[:data].select(:id, :subject, :project_issues_index, :updated_on, :created_on)) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 87b7c051e..65e860fe9 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -9,6 +9,7 @@ class Api::V1::IssuesController < Api::V1::BaseController @total_issues_count = @object_result[:total_issues_count] @opened_issues_count = @object_result[:opened_issues_count] @closed_issues_count = @object_result[:closed_issues_count] + @full_child_count = @object_result[:full_child_count] if params[:only_name].present? @issues = kaminary_select_paginate(@object_result[:data].select(:id, :subject, :project_issues_index, :updated_on, :created_on)) else diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 41124d5a2..8d2d6fe9b 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -61,7 +61,8 @@ class Api::V1::Issues::ListService < ApplicationService total_issues_count: @total_issues_count, closed_issues_count: @closed_issues_count, opened_issues_count: @opened_issues_count, - complete_issues_count: @complete_issues_count + complete_issues_count: @complete_issues_count, + full_child_count: @full_child_count } # rescue # raise Error, "服务器错误，请联系系统管理员！" @@ -214,6 +215,8 @@ class Api::V1::Issues::ListService < ApplicationService end end + @full_child_count = scope.sum(:child_count) + @queried_issues = scope end diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder index 30e26d2ca..0bb56e81b 100644 --- a/app/views/api/v1/issues/index.json.jbuilder +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -2,6 +2,7 @@ json.total_issues_count @total_issues_count json.opened_count @opened_issues_count json.closed_count @closed_issues_count json.complete_count @complete_issues_count +json.full_child_count @full_child_count json.total_count @issues.total_count json.has_created_issues @project.present? ? @project.issues.size > 0 : 0 json.issues @issues.each do |issue|