From 43f33b1af296f5e3952c5012210bba470c2bf846 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 16 Dec 2024 14:18:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E6=A6=82=E8=A7=88?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E4=B8=AD=E5=B7=A5=E4=BD=9C=E9=A1=B9=E5=8C=85?= =?UTF-8?q?=E6=8B=AC=E5=B7=B2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/projects_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/pm/projects_controller.rb b/app/controllers/api/pm/projects_controller.rb index 82b931f05..51e68d18f 100644 --- a/app/controllers/api/pm/projects_controller.rb +++ b/app/controllers/api/pm/projects_controller.rb @@ -73,9 +73,9 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController } end open_data = { - "1": type_status_data[1][1].to_i + type_status_data[1][2].to_i, - "2": type_status_data[2][1].to_i + type_status_data[2][2].to_i, - "3": type_status_data[3][1].to_i + type_status_data[3][2].to_i, + "1": type_status_data[1][1].to_i + type_status_data[1][2].to_i + type_status_data[1][3].to_i, + "2": type_status_data[2][1].to_i + type_status_data[2][2].to_i + type_status_data[2][3].to_i, + "3": type_status_data[3][1].to_i + type_status_data[3][2].to_i + type_status_data[3][3].to_i, } if type_count_data.keys.size < 3 nedd_add = [1,2,3] - type_count_data.keys From 5dc16d11c5077922ef2ed2a28da7f8630c0bf9c1 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 16 Dec 2024 16:04:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=95=B0=E9=87=8F=E4=BB=A5=E5=8F=8A=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=8F=98=E6=9B=B4=E9=A1=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/pm/issues_controller.rb | 4 ++-- app/controllers/api/pm/projects_controller.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb index 7c527e6cc..49cb5295c 100644 --- a/app/controllers/api/pm/issues_controller.rb +++ b/app/controllers/api/pm/issues_controller.rb @@ -261,8 +261,8 @@ class Api::Pm::IssuesController < Api::Pm::BaseController end full_link_issues_ids = full_link_issues_ids - exclude_issues_ids @requirement_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:1, root_id: nil).pm_includes - @task_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:2, root_id: nil).pm_includes - @bug_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:3, root_id: nil).pm_includes + @task_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:2).pm_includes + @bug_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:3).pm_includes end private diff --git a/app/controllers/api/pm/projects_controller.rb b/app/controllers/api/pm/projects_controller.rb index 51e68d18f..bd7c0991d 100644 --- a/app/controllers/api/pm/projects_controller.rb +++ b/app/controllers/api/pm/projects_controller.rb @@ -73,9 +73,9 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController } end open_data = { - "1": type_status_data[1][1].to_i + type_status_data[1][2].to_i + type_status_data[1][3].to_i, - "2": type_status_data[2][1].to_i + type_status_data[2][2].to_i + type_status_data[2][3].to_i, - "3": type_status_data[3][1].to_i + type_status_data[3][2].to_i + type_status_data[3][3].to_i, + "1": type_status_data[1][1].to_i + type_status_data[1][2].to_i + type_status_data[1][3].to_i + type_status_data[1][6].to_i, + "2": type_status_data[2][1].to_i + type_status_data[2][2].to_i + type_status_data[2][3].to_i + type_status_data[2][6].to_i, + "3": type_status_data[3][1].to_i + type_status_data[3][2].to_i + type_status_data[3][3].to_i + type_status_data[3][6].to_i, } if type_count_data.keys.size < 3 nedd_add = [1,2,3] - type_count_data.keys