From 79863995d69c312de07859b61052b3fc4a8576fc Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Thu, 15 May 2025 14:06:22 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20issue=E7=8A=B6=E6=80=81=E5=B7=B2?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A2=9E=E5=8A=A0=E4=BF=A1=E6=81=AF=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/pm/issues_controller.rb            |  1 +
 app/services/api/pm/issues/update_service.rb           | 10 ++++++++--
 app/views/api/pm/issues/journals/_detail.json.jbuilder |  1 +
 db/migrate/202505152345541_add_journal_detail_msg.rb   |  5 +++++
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/202505152345541_add_journal_detail_msg.rb

diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb
index 49cb5295c..d8c849d53 100644
--- a/app/controllers/api/pm/issues_controller.rb
+++ b/app/controllers/api/pm/issues_controller.rb
@@ -327,6 +327,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
       :branch_name, :start_date, :due_date, :time_scale,
       :subject, :description, :blockchain_token_num, :root_subject,
       :pm_project_id, :pm_sprint_id, :pm_issue_type, :root_id, :link_able_id, :project_id,
+      :status_msg,
       issue_tag_ids: [],
       assigner_ids: [],
       attachment_ids: [],
diff --git a/app/services/api/pm/issues/update_service.rb b/app/services/api/pm/issues/update_service.rb
index 2f1816446..1c5487f91 100644
--- a/app/services/api/pm/issues/update_service.rb
+++ b/app/services/api/pm/issues/update_service.rb
@@ -4,7 +4,7 @@ class Api::Pm::Issues::UpdateService < ApplicationService
   include Api::V1::Issues::Concerns::Loadable 
 
   attr_reader :project, :issue, :current_user, :operate_by
-  attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description, :blockchain_token_num
+  attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description, :blockchain_token_num,:status_msg
   attr_reader :target_pm_project_id, :pm_sprint_id, :pm_issue_type, :root_id, :time_scale
   attr_reader :issue_tag_ids, :assigner_ids, :attachment_ids, :receivers_login, :before_issue_tag_ids, :before_assigner_ids, :project_id
   attr_accessor :add_assigner_ids, :previous_issue_changes, :updated_issue, :atme_receivers
@@ -18,6 +18,7 @@ class Api::Pm::Issues::UpdateService < ApplicationService
     @current_user = current_user
     @operate_by = operate_by
     @status_id = params[:status_id]
+    @status_msg = params[:status_msg]
     @priority_id = params[:priority_id]
     @milestone_id = params[:milestone_id]
     @branch_name = params[:branch_name]
@@ -201,7 +202,12 @@ class Api::Pm::Issues::UpdateService < ApplicationService
       # 修改状态
       if @updated_issue.previous_changes["status_id"].present?
         journal = @updated_issue.journals.create!({user_id: current_user.id, operate_by: @operate_by})
-        journal.journal_details.create!({property: @updated_issue.pm_issue_type_string, prop_key: "status_id", old_value: @updated_issue.previous_changes["status_id"][0], value: @updated_issue.previous_changes["status_id"][1]})
+        journal.journal_details.create!({property: @updated_issue.pm_issue_type_string,
+                                         prop_key: "status_id",
+                                         old_value: @updated_issue.previous_changes["status_id"][0],
+                                         value: @updated_issue.previous_changes["status_id"][1]},
+                                         status_msg: @status_msg
+        )
       end
 
       # 修改优先级
diff --git a/app/views/api/pm/issues/journals/_detail.json.jbuilder b/app/views/api/pm/issues/journals/_detail.json.jbuilder
index fdf4bc716..876a1a921 100644
--- a/app/views/api/pm/issues/journals/_detail.json.jbuilder
+++ b/app/views/api/pm/issues/journals/_detail.json.jbuilder
@@ -13,6 +13,7 @@ if journal.is_journal_detail?
   detail = journal.journal_details.take
   json.operate_category journal.pm_operate_category
   json.operate_content journal.is_journal_detail? ? journal.pm_operate_content : nil
+  json.status_msg detail.status_msg
 else
   json.notes journal.notes 
   json.comments_count journal.comments_count
diff --git a/db/migrate/202505152345541_add_journal_detail_msg.rb b/db/migrate/202505152345541_add_journal_detail_msg.rb
new file mode 100644
index 000000000..69172aec9
--- /dev/null
+++ b/db/migrate/202505152345541_add_journal_detail_msg.rb
@@ -0,0 +1,5 @@
+class AddJournalDetailMsg < ActiveRecord::Migration[5.2]
+  def change
+    add_column :journal_details, :status_msg, :string
+  end
+end