|
|
|
@ -792,12 +792,22 @@ class ManagementsController < ApplicationController
|
|
|
|
|
@menu_type = 8
|
|
|
|
|
@sub_type = 2
|
|
|
|
|
@search = params[:search]
|
|
|
|
|
@beginTime = params[:beginTime]
|
|
|
|
|
@endTime = params[:endTime]
|
|
|
|
|
if @search.present?
|
|
|
|
|
shixun_ids = Shixun.where("name like ?", "%#{params[:search]}%").pluck(:id)
|
|
|
|
|
@discusses = Discuss.where(:dis_type => "Shixun", :dis_id => shixun_ids).reorder("created_at desc")
|
|
|
|
|
else
|
|
|
|
|
@discusses = Discuss.where(:dis_type => "Shixun").reorder("created_at desc")
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
if params[:beginTime] && params[:beginTime].strip != ""
|
|
|
|
|
@discusses = @discusses.where("created_at >= '#{Time.parse(params[:beginTime])}'")
|
|
|
|
|
end
|
|
|
|
|
if params[:endTime] && params[:endTime].strip != ""
|
|
|
|
|
@discusses = @discusses.where("created_at <= '#{Time.parse(params[:endTime])}'")
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
@all_discusses = @discusses
|
|
|
|
|
@discusses_count = @discusses.count
|
|
|
|
|
@limit = 20
|
|
|
|
@ -1242,6 +1252,15 @@ end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def delete_customers
|
|
|
|
|
if params[:customer]
|
|
|
|
|
customer = Customer.where(id: params[:customer]).first
|
|
|
|
|
@current_partner = customer.partner
|
|
|
|
|
customer.school.update_attributes(:customer_id => nil)
|
|
|
|
|
customer.destroy if customer && @current_partner
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def all_partners
|
|
|
|
|
@search = params[:search]
|
|
|
|
|
@province = params[:province]
|
|
|
|
@ -1275,13 +1294,14 @@ end
|
|
|
|
|
if school_ids.length > 0
|
|
|
|
|
school_ids.each do |s|
|
|
|
|
|
school = School.where("id = ?",s).first
|
|
|
|
|
if school.present?
|
|
|
|
|
if school.present? && school.partner_id.nil?
|
|
|
|
|
partner = Partner.new(name: school.name)
|
|
|
|
|
partner.save
|
|
|
|
|
school.update_attributes(:partner_id => partner.id)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
render :json => {status: 1, message: "创建成功!"}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1354,6 +1374,16 @@ end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
# 合作伙伴删除管理员
|
|
|
|
|
def delete_partner_member
|
|
|
|
|
if params[:partner] && params[:partner_member]
|
|
|
|
|
@partner = Partner.find_by_id params[:partner]
|
|
|
|
|
user = User.find_by_id params[:partner_member]
|
|
|
|
|
user.update_attributes(partner_id: nil) if !@partner.nil? && !user.nil?
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# check 部门 identifier是否重复
|
|
|
|
|
def check_depart_identifier
|
|
|
|
|
logger.info("###############{params}")
|
|
|
|
@ -4232,7 +4262,8 @@ end
|
|
|
|
|
sheet1[count_row, 5] = discusses.count
|
|
|
|
|
discusses.each_with_index do |discuss, j|
|
|
|
|
|
user = discuss.user
|
|
|
|
|
sheet1[count_row, 6] = discuss.content.gsub(/<img.*\/>/, "【图片评论】").gsub(/!\[\].+\)/, "【图片评论】")
|
|
|
|
|
content = discuss.content.gsub(/<img.*\/>/, "【图片评论】").gsub(/!\[\].+\)/, "【图片评论】")
|
|
|
|
|
sheet1[count_row, 6] = strip_html content
|
|
|
|
|
sheet1[count_row, 7] = "第#{discuss.position}关"
|
|
|
|
|
sheet1[count_row, 8] = user.show_real_name
|
|
|
|
|
sheet1[count_row, 9] = user.identity
|
|
|
|
|