动态和pr的部分修改

app/controllers/issues_controller.rb

@@ -306,6 +306,7 @@ class IssuesController < ApplicationController
           IssueTagsRelate.create!(issue_id: @new_issue.id, issue_tag_id: tag)
         end
       end
+      @new_issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
       @status = 1
     else
       @status = -1
@@ -328,6 +329,7 @@ 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)

app/controllers/project_trends_controller.rb

@@ -19,11 +19,11 @@ class ProjectTrendsController < ApplicationController
     end
 
     if check_type.present?
-      project_trends = project_trends.where(trend_type: check_type.to_s.titleize)
+      project_trends = project_trends.where(trend_type: check_type.to_s.strip)
     end
 
     if check_status.present?
-      project_trends = project_trends.where(action_type: check_status.to_s)
+      project_trends = project_trends.where(action_type: check_status.to_s.strip)
     end
     project_trends = project_trends.order("created_at desc")
 

app/controllers/pull_requests_controller.rb

@@ -358,7 +358,8 @@ class PullRequestsController < ApplicationController
         render json: {
           status: -2,
           message: "在这些分支之间的合并请求已存在",
-          pull_request_id: can_merge.first.id
+          pull_request_id: can_merge.first.id,
+          pull_request_name: can_merge.first.try(:title)
         }
       else
         normal_status(0, "可以合并")