From 01f37315be5e37c0532f8a05f3b0f0642425865a Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Mon, 2 Mar 2020 11:44:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E5=AE=8C=E6=88=90=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 10 +++++----- app/models/issue.rb | 11 ++++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 994c1bd91..3efcd19a9 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -330,11 +330,11 @@ class IssuesController < ApplicationController @issue.issue_times.update_all(end_time: Time.now) else @issue&.project_trends&.update_all(action_type: "create") - version = @issue&.version - if version.present? - percent = version.issues_count == 0 ? 0.0 : ((version.closed_issues_count - 1) / version.issues_count) - version.update_attributes(closed_issues_count: (version.closed_issues_count - 1), percent: percent) - end + # version = @issue&.version + # if version.present? + # percent = version.issues_count == 0 ? 0.0 : ((version.closed_issues_count - 1) / version.issues_count) + # version.update_attributes(closed_issues_count: (version.closed_issues_count - 1), percent: percent) + # end end @issue.custom_journal_detail("close_issue",old_message, "#{message}") diff --git a/app/models/issue.rb b/app/models/issue.rb index 8c2bfc0ae..a8a687d78 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -90,9 +90,14 @@ class Issue < ApplicationRecord end def change_versions_count - if version.present? && self.status_id == 5 - percent = version.issues_count == 0 ? 0.0 : ((version.closed_issues_count + 1) / version.issues_count) - version.update_attributes(closed_issues_count: (version.closed_issues_count + 1), percent: percent) + if self.version.present? + if self.status_id == 5 + percent = self.version.issues_count == 0 ? 0.0 : ((self.version.closed_issues_count + 1).to_f / self.version.issues_count) + self.version.update_attributes(closed_issues_count: (self.version.closed_issues_count + 1), percent: percent) + else + percent = self.version.issues_count == 0 ? 0.0 : ((self.version.closed_issues_count - 1).to_f / self.version.issues_count) + self.version.update_attributes(closed_issues_count: (self.version.closed_issues_count - 1), percent: percent) + end end end