From 95f49450b06210922cbecfbbfc96e8ff401ec2d7 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 1 Aug 2025 15:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=85=B3=E8=81=94?= =?UTF-8?q?=E7=9A=84=E7=96=91=E4=BF=AE=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 14 ++++++++++++++ app/models/journal.rb | 14 ++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index d65646bd5..08c676b00 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -141,6 +141,20 @@ class Issue < ApplicationRecord end end + def pm_issue_type_chinese_string + case pm_issue_type + when 1 + "需求" + when 2 + "任务" + when 3 + "缺陷" + else + "疑修" + end + end + + def destroy_be_pm_links PmLink.where(be_linkable_type:"Issue",be_linkable_id:self.id).map(&:destroy) end diff --git a/app/models/journal.rb b/app/models/journal.rb index 9b3e7dbc6..2baef42e0 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -483,8 +483,8 @@ class Journal < ApplicationRecord end return content when 'link_issue' - old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 【#{i.subject}】" : "工作项 [#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") - new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 【#{i.subject}】" : "工作项 [#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") + old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 【#{i.subject}】" : "工作项 [#{i.pm_issue_type_chinese_string}]-<#{i.subject}>"}.join("、") + new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 【#{i.subject}】" : "工作项 [#{i.pm_issue_type_chinese_string}]-<#{i.subject}>"}.join("、") if detail.old_value.nil? || detail.old_value.blank? content += "新建了关联的#{new_value}" else @@ -494,13 +494,10 @@ class Journal < ApplicationRecord content += "新建了关联的#{new_value}" end end - content.gsub!('1', "需求") - content.gsub!('2', "任务") - content.gsub!('3', "缺陷") return content when 'tag_link_issue' - old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 【#{i.subject}】" : "工作项 [#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") - new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 【#{i.subject}】" : "工作项 [#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") + old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 【#{i.subject}】" : "工作项 [#{i.pm_issue_type_chinese_string}]-<#{i.subject}>"}.join("、") + new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 【#{i.subject}】" : "工作项 [#{i.pm_issue_type_chinese_string}]-<#{i.subject}>"}.join("、") if detail.old_value.nil? || detail.old_value.blank? content += "关联了#{new_value}" else @@ -510,9 +507,6 @@ class Journal < ApplicationRecord content += "关联了#{new_value}" end end - content.gsub!('1', "需求") - content.gsub!('2', "任务") - content.gsub!('3', "缺陷") return content when 'issue' issue = self.issue