fixed 竞赛增加5个扩展字段

This commit is contained in:
xxq250 2024-07-17 15:01:54 +08:00
parent 788699017f
commit 2539de0589
3 changed files with 17 additions and 6 deletions

View File

@ -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

View File

@ -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)

View File

@ -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