From f4808de6862e2f87292deb1798a38522d80dc017 Mon Sep 17 00:00:00 2001 From: XuCheng642 <287102909@qq.com> Date: Fri, 18 Aug 2017 17:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=83=A8=E9=97=A8=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 29 ++++++++++++++++++ app/controllers/managements_controller.rb | 30 +++++++++++++++++++ .../managements/_class_shixuns_list.html.erb | 3 +- app/views/managements/_unit_list.html.erb | 2 +- .../_update_department_form.html.erb | 13 ++++++-- .../managements/_update_school_form.html.erb | 10 ++++++- config/routes.rb | 1 - 7 files changed, 82 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 6e10f6cbb..a3d1a387e 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -832,6 +832,35 @@ class AdminController < ApplicationController format.js end end + # 单位审核：删除 + def delete_applied_schools + applied_school = ApplyAddSchools.find(params[:id]) + applied_message_id = applied_school.school_id + applied_message = AppliedMessage.where(:applied_id => applied_message_id, :applied_type => "ApplyAddSchools") + applied_message.update_all(:status => 3) + applied_school.update_attribute(:status, 3) + # 单位对应的部门审核也应做删除处理 + applied_departments = ApplyAddDepartment.where(:school_id => applied_school.school_id) + applied_departments.update_all(:status => 3) + AppliedMessage.where(:applied_id => applied_departments.map(&:id), :applied_type => "ApplyAddDepartment").update_all(:status => 3) + # 未审批删除 + if params[:tip] == "unapplied" + AppliedMessage.create(:user_id => applied_school.user_id, :status => 3, :viewed => 0, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name ) + if applied_departments.first + AppliedMessage.create(:user_id => applied_departments.first.user_id, :status => 3, :viewed => 0, :applied_id => applied_departments.first.id, :applied_type => "ApplyAddDepartment", :name => applied_departments.first.name ) + end +# 删除学校的用户 + users = UserExtensions.where("school_id = #{applied_school.school_id}") + users.update_all(:school_id => nil, :department_id => nil) + applied_school.school.destroy + applied_school.school.departments.destroy_all + redirect_to unit_managements_path + # 已审批删除 + elsif params[:tip] == "applied" + applied_school.destroy + redirect_to unit_managements_path + end + end # 部门审核 # 未审批tab页 diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 4aa241446..2ede27897 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -272,6 +272,36 @@ end redirect_to unit_managements_path end + # 删除 + def delete_applied_schools + applied_school = ApplyAddSchools.find(params[:id]) + applied_message_id = applied_school.school_id + applied_message = AppliedMessage.where(:applied_id => applied_message_id, :applied_type => "ApplyAddSchools") + applied_message.update_all(:status => 3) + applied_school.update_attribute(:status, 3) + # 单位对应的部门审核也应做删除处理 + applied_departments = ApplyAddDepartment.where(:school_id => applied_school.school_id) + applied_departments.update_all(:status => 3) + AppliedMessage.where(:applied_id => applied_departments.map(&:id), :applied_type => "ApplyAddDepartment").update_all(:status => 3) + # 未审批删除 + if params[:tip] == "unapplied" + AppliedMessage.create(:user_id => applied_school.user_id, :status => 3, :viewed => 0, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name ) + if applied_departments.first + AppliedMessage.create(:user_id => applied_departments.first.user_id, :status => 3, :viewed => 0, :applied_id => applied_departments.first.id, :applied_type => "ApplyAddDepartment", :name => applied_departments.first.name ) + end +# 删除学校的用户 + users = UserExtensions.where("school_id = #{applied_school.school_id}") + users.update_all(:school_id => nil, :department_id => nil) + applied_school.school.destroy + applied_school.school.departments.destroy_all + redirect_to unit_managements_path + # 已审批删除 + elsif params[:tip] == "applied" + applied_school.destroy + redirect_to unit_managements_path + end + end + # 单位审批修改 def all_schools apply_schools = ApplyAddSchools.where("status = 0") diff --git a/app/views/managements/_class_shixuns_list.html.erb b/app/views/managements/_class_shixuns_list.html.erb index da3599b35..315d45620 100644 --- a/app/views/managements/_class_shixuns_list.html.erb +++ b/app/views/managements/_class_shixuns_list.html.erb @@ -25,7 +25,7 @@ <%= format_time c_shixun.created_at %> <% if c_shixun.status == 0 %> - 删除 + 删除 <% else %> -- <% end %> @@ -41,6 +41,7 @@ \ No newline at end of file diff --git a/app/views/managements/_update_school_form.html.erb b/app/views/managements/_update_school_form.html.erb index 8e696b10a..d02780f5d 100644 --- a/app/views/managements/_update_school_form.html.erb +++ b/app/views/managements/_update_school_form.html.erb @@ -1,7 +1,7 @@ <%= form_tag edit_applied_schools_managements_path(:applied_id =>edit_id), :id => 'schools_list_form' %>
<%#= hidden_field_tag(:send_id, edit_id) %> -
+
<% if !schools.empty? && !@search.nil? %> <% schools.each do |school| %>
    @@ -15,3 +15,11 @@
+ \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 2c486d18b..3d142e4cb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1601,7 +1601,6 @@ RedmineApp::Application.routes.draw do get 'admin/has_applied_departments', as: :applied_departments get 'admin/approve_applied_departments' delete 'admin/delete_applied_departments' - get 'admin/leave_messages' match 'admin/messages_list', as: :messages_list match 'admin/project_messages', as: :project_messages