diff --git a/app/models/journal.rb b/app/models/journal.rb index a72526872..a110cd85a 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -483,37 +483,66 @@ 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}]-<#{i.subject}>"}.join("、") - new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "[#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") - if detail.old_value.nil? || detail.old_value.blank? - content += "新建了关联的工作项#{new_value}" - else - if detail.value.nil? || detail.value.blank? - content += "删除了关联的工作项#{old_value}" + if i.pm_issue_type.nil? && i.pm_project_id.nil? + old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| "【#{i.subject}】"}.join("、") + new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "【#{i.subject}】"}.join("、") + if detail.old_value.nil? || detail.old_value.blank? + content += "新建了关联的疑修 #{new_value}" else + if detail.value.nil? || detail.value.blank? + content += "删除了关联的疑修 #{old_value}" + else + content += "新建了关联的疑修 #{new_value}" + end + end + else + old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| "[#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") + new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "[#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") + if detail.old_value.nil? || detail.old_value.blank? content += "新建了关联的工作项#{new_value}" + else + if detail.value.nil? || detail.value.blank? + content += "删除了关联的工作项#{old_value}" + else + content += "新建了关联的工作项#{new_value}" + end 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}]-<#{i.subject}>"}.join("、") - new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "[#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") - if detail.old_value.nil? || detail.old_value.blank? - content += "关联了工作项#{new_value}" - else - if detail.value.nil? || detail.value.blank? - content += "取消了关联的工作项#{old_value}" + if i.pm_issue_type.nil? && i.pm_project_id.nil? + old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| "【#{i.subject}】"}.join("、") + new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "【#{i.subject}】"}.join("、") + if detail.old_value.nil? || detail.old_value.blank? + content += "关联了疑修 #{new_value}" else - content += "关联了工作项#{new_value}" + if detail.value.nil? || detail.value.blank? + content += "取消了关联的疑修 #{old_value}" + else + content += "关联了疑修 #{new_value}" + end end + content.gsub!('1', "需求") + content.gsub!('2', "任务") + content.gsub!('3', "缺陷") + return content + else + old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| "[#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") + new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "[#{i.pm_issue_type}]-<#{i.subject}>"}.join("、") + if detail.old_value.nil? || detail.old_value.blank? + content += "关联了工作项#{new_value}" + else + if detail.value.nil? || detail.value.blank? + content += "取消了关联的工作项#{old_value}" + else + content += "关联了工作项#{new_value}" + end + end + content.gsub!('1', "需求") + content.gsub!('2', "任务") + content.gsub!('3', "缺陷") + return content end - content.gsub!('1', "需求") - content.gsub!('2', "任务") - content.gsub!('3', "缺陷") - return content when 'issue' issue = self.issue case issue.pm_issue_type