From 2539de0589807ad54082f9db40a10caa5a7ea051 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 17 Jul 2024 15:01:54 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E7=AB=9E=E8=B5=9B=E5=A2=9E=E5=8A=A05?=
 =?UTF-8?q?=E4=B8=AA=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/competition_infos_controller.rb       | 10 +++++-----
 app/views/competition_infos/show.json.jbuilder        |  4 +++-
 db/migrate/20240717100711_add_competition_info_ext.rb |  9 +++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20240717100711_add_competition_info_ext.rb

diff --git a/app/controllers/competition_infos_controller.rb b/app/controllers/competition_infos_controller.rb
index cb752ec47..2b36c5639 100644
--- a/app/controllers/competition_infos_controller.rb
+++ b/app/controllers/competition_infos_controller.rb
@@ -27,7 +27,7 @@ class CompetitionInfosController < ApplicationController
     sort_by = params[:sort_by] || "created_at"
     competition_infos = CompetitionInfo.where(status: true)
     competition_infos = competition_infos.where("title like ?", "%#{params[:name]}%") if params[:name].present?
-    @total_count= competition_infos.count
+    @total_count = competition_infos.count
     if sort_by.to_s == "hot"
       competition_infos = competition_infos.select("competition_infos.*, (SELECT count(1) from competition_users where competition_users.competition_info_id = competition_infos.id ) as count").order("count #{sort_direction}")
     elsif sort_by.to_s == "new"
@@ -139,7 +139,7 @@ class CompetitionInfosController < ApplicationController
     @competition_users = paginate(competition_users)
     respond_to do |format|
       format.json
-      #导出功能
+      # 导出功能
       format.xlsx {
         set_export_cookies
         competition_users = params[:upload].to_s == "true" ? competition_users.where(status: [2, 3]) : competition_users.where(status: [1, 2, 3])
@@ -345,7 +345,7 @@ class CompetitionInfosController < ApplicationController
     render_ok
   end
 
-  #赛事风采
+  # 赛事风采
   def statistics
     @competition_users = @competition_info.competition_users.where(status: [1, 2, 3])
     @upload_count = @competition_users.joins("join attachments on attachments.container_type='CompetitionUser' and attachments.container_id = competition_users.id").count
@@ -362,7 +362,6 @@ class CompetitionInfosController < ApplicationController
     @competition_users = paginate(competition_users)
   end
 
-
   def destroy
     if @competition_info.destroy!
       flash[:success] = '删除成功'
@@ -382,7 +381,8 @@ class CompetitionInfosController < ApplicationController
   def competition_info_params
     params.require(:competition_info).permit(:title, :zones, :zones_local, :sub_competitions, :identifier, :content,
                                              :video_url, :is_local, :manager_ids, :upload_date, :enroll_date, :guide, :about_us,
-                                             :banner_url, :enroll_template, :enroll_columns, :applet_banner_url,:start_at, :sort_no)
+                                             :banner_url, :enroll_template, :enroll_columns, :applet_banner_url, :start_at, :sort_no,
+                                             :ext1, :ext2, :ext3, :ext4, :ext5)
   end
 
   def find_competition
diff --git a/app/views/competition_infos/show.json.jbuilder b/app/views/competition_infos/show.json.jbuilder
index 99e989896..1b7509353 100644
--- a/app/views/competition_infos/show.json.jbuilder
+++ b/app/views/competition_infos/show.json.jbuilder
@@ -1,7 +1,9 @@
 json.status 0
 json.message "success"
 json.data do
-  json.extract! @competition_info, :id, :identifier, :title, :content, :video_url, :is_local, :enroll_date, :upload_date, :guide, :about_us,:banner_url,:enroll_template, :applet_banner_url, :watchers_count,:start_at, :visits, :sort_no
+  json.extract! @competition_info, :id, :identifier, :title, :content, :video_url, :is_local, :enroll_date,
+                :upload_date, :guide, :about_us,:banner_url,:enroll_template, :applet_banner_url, :watchers_count,:start_at,
+                :visits, :sort_no, :ext1, :ext2, :ext3, :ext4, :ext5
   json.zones @competition_info.competition_zones
   json.sub_competitions @competition_info.sub_competitions.to_s.split(",")
   json.is_manager @competition_info.is_manager?(current_user)
diff --git a/db/migrate/20240717100711_add_competition_info_ext.rb b/db/migrate/20240717100711_add_competition_info_ext.rb
new file mode 100644
index 000000000..be54c9fdf
--- /dev/null
+++ b/db/migrate/20240717100711_add_competition_info_ext.rb
@@ -0,0 +1,9 @@
+class AddCompetitionInfoExt < ActiveRecord::Migration[5.2]
+  def change
+    add_column :competition_infos, :ext1, :text
+    add_column :competition_infos, :ext2, :text
+    add_column :competition_infos, :ext3, :text
+    add_column :competition_infos, :ext4, :text
+    add_column :competition_infos, :ext5, :text
+  end
+end