Trustie
/
forgeplus
forked from Gitlink/forgeplus
21
0
Fork 8
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' into dev_osredm_server

This commit is contained in:
yystopf 2025-08-01 15:26:51 +08:00
parent c34d723856 bcf0b376a9
commit 6a3fb20caa
1 changed files with 23 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/models/journal.rb
View File

@ -484,66 +484,37 @@ class Journal < ApplicationRecord
end
return content
when 'link_issue'
if i.pm_issue_type.nil? && i.pm_project_id.nil?
old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| "<b>【#{i.subject}】</b>"}.join("、")
new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "<b>【#{i.subject}】</b>"}.join("、")
if detail.old_value.nil? || detail.old_value.blank?
content += "新建了关联的疑修 #{new_value}"
old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 <b>【#{i.subject}】</b>" : "工作项 <b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.join("、")
new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 <b>【#{i.subject}】</b>" : "工作项 <b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.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
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| "<b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.join("、")
new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "<b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.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
content += "新建了关联的#{new_value}"
end
end
content.gsub!('1', "需求")
content.gsub!('2', "任务")
content.gsub!('3', "缺陷")
return content
when 'tag_link_issue'
if i.pm_issue_type.nil? && i.pm_project_id.nil?
old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| "<b>【#{i.subject}】</b>"}.join("、")
new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "<b>【#{i.subject}】</b>"}.join("、")
if detail.old_value.nil? || detail.old_value.blank?
content += "关联了疑修 #{new_value}"
old_value = Issue.where(id: detail.old_value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 <b>【#{i.subject}】</b>" : "工作项 <b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.join("、")
new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| i.pm_issue_type.nil? && i.pm_project_id.nil? ? "疑修 <b>【#{i.subject}】</b>" : "工作项 <b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.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
if detail.value.nil? || detail.value.blank?
content += "取消了关联的疑修 #{old_value}"
else
content += "关联了疑修 #{new_value}"
end
content += "关联了#{new_value}"
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| "<b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.join("、")
new_value = Issue.where(id: detail.value.to_s.split(",")).map{|i| "<b>[#{i.pm_issue_type}]-<#{i.subject}></b>"}.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