From 7d6c48e86c8bfb2364bf2d3a4d4528724762e47c Mon Sep 17 00:00:00 2001 From: daiao <35855898@qq.com> Date: Tue, 12 Mar 2019 20:24:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E8=AE=A4=E8=AF=81=E3=80=91?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=AE=A4=E8=AF=81=E7=9A=84=E7=95=8C=E5=88=AB?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E6=AF=95=E4=B8=9A=E8=A6=81=E6=B1=82=20vs=20=E5=9F=B9=E5=85=BB?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=92=8C=20=E6=AF=95=E4=B8=9A=E8=A6=81?= =?UTF-8?q?=E6=B1=82=20vs=20=E9=80=9A=E7=94=A8=E6=A0=87=E5=87=86=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E7=9F=A9=E9=98=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ec_years_controller.rb | 41 ++++++++++++++++---------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/app/controllers/ec_years_controller.rb b/app/controllers/ec_years_controller.rb index 12ad6212..1e77f089 100644 --- a/app/controllers/ec_years_controller.rb +++ b/app/controllers/ec_years_controller.rb @@ -387,6 +387,14 @@ class EcYearsController < ApplicationController new_egs.save! # 记录新旧对应关系,为之后的中间表做记录 egs_record << [pre_egs.id, new_egs.id] + prev_ersvss = EcRequireSubVsStandard.where(:ec_graduation_subitem_id => pre_egs.id) + prev_ersvss.each do |prev_ersvs| + new_ersvss = EcRequireSubVsStandard.new + new_ersvss.attributes = prev_ersvs.attributes.dup.except("id", "ec_graduation_subitem_id") + new_ersvss.ec_graduation_subitem_id = new_egs.id + new_ersvss.save! + end + end end @@ -398,28 +406,29 @@ class EcYearsController < ApplicationController new_eto.ec_year_id = ec_year.id new_eto.save! - # 复制 "毕业要去 vs 培养目标" - pre_ervsos = EcRequirementVsObjective.where(:ec_training_objective_id => pre_eto.id) - pre_ervsos.each do |ervso| - new_ervso = EcRequirementVsObjective.new - new_ervso.attributes = ervso.attributes.dup.except("id", "ec_training_objective_id", "ec_graduation_requirement_id") - new_ervso.ec_training_objective_id = new_eto.id - new_egr_id = -1 - egr_record.each do |egr_id| - if egr_id[0] == ervso.id - new_egr_id = egr_id[1] - end - end - raise("找不对应的毕业要求") if new_egr_id == -1 - new_ervso.ec_graduation_requirement_id = new_egr_id - end - # 复制 "培养目标分项" pre_eto.ec_training_subitems.try(:each) do |pre_ets| new_ets = EcTrainingSubitem.new new_ets.attributes = pre_ets.attributes.dup.except("id", "ec_training_objective_id") new_ets.ec_training_objective_id = new_eto.id new_ets.save! + + # 复制 "毕业要去 vs 培养目标" + pre_ervsos = EcRequirementVsObjective.where(:ec_training_objective_id => pre_ets.id) + pre_ervsos.each do |ervso| + new_ervso = EcRequirementVsObjective.new + new_ervso.attributes = ervso.attributes.dup.except("id", "ec_training_objective_id", "ec_graduation_requirement_id") + new_ervso.ec_training_objective_id = new_ets.id + new_egr_id = -1 + egr_record.each do |egr_id| + if egr_id[0] == ervso.ec_graduation_requirement_id + new_egr_id = egr_id[1] + end + end + raise("找不对应的毕业要求") if new_egr_id == -1 + new_ervso.ec_graduation_requirement_id = new_egr_id + new_ervso.save! + end end end From 045ac6bff71c80041c6739adcbc108241d8bc42c Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 12 Mar 2019 20:30:46 +0800 Subject: [PATCH 2/3] is_manager --- .../ec/graduatesRequirement/GraduatesRequirement.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js b/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js index 827144b5..d6765e72 100644 --- a/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js +++ b/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js @@ -538,6 +538,7 @@ class GraduatesRequirement extends Component { daChengYuZhi: response.data.calculation_value, daChengYuZhiSaved: response.data.calculation_value, course_ids: response.data.course_ids, + is_manager: response.data.is_manager, calculating: false, }) } @@ -583,13 +584,14 @@ class GraduatesRequirement extends Component { } render() { const { match, history, current_user } = this.props - const { daChengYuZhiEditableMode, daChengYuZhi, daChengYuZhiSaved } = this.state + const { daChengYuZhiEditableMode, daChengYuZhi, daChengYuZhiSaved, is_manager } = this.state let { schooldata } =this.state; let { example_major, template_major } = schooldata; - let showCalculateButton = false; - if (example_major && current_user.admin || !example_major && template_major) { - showCalculateButton = true; - } + let showCalculateButton = is_manager; + // let showCalculateButton = false; + // if (example_major && current_user.admin || !example_major && template_major) { + // showCalculateButton = true; + // } return (
From 9f0e30676c6338caef42d921feebb651bb4f7bfe Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 12 Mar 2019 20:32:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ecloud=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ecloud_controller.rb | 61 ++++++++++++++++++---------- app/controllers/oauth_controller.rb | 2 +- app/models/ecloud_service.rb | 2 +- 3 files changed, 41 insertions(+), 24 deletions(-) diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb index bd0170f9..8e120b9b 100644 --- a/app/controllers/ecloud_controller.rb +++ b/app/controllers/ecloud_controller.rb @@ -5,6 +5,7 @@ require 'digest' class EcloudController < ApplicationController skip_before_filter :verify_authenticity_token + before_filter check_sign before_filter :user_setup before_filter :require_login, only: [:authorize] @@ -35,31 +36,44 @@ class EcloudController < ApplicationController # 企业开通 # ecordercode 唯一标志一个企业的订购关系 def bs_new - begin - ecloud = Ecloud.create!(applyno: params['applyno'], ecordercode: params['ecordercode'], opttype: params['opttype'], - trial: params['trial'], bossorderid: params['bossorderid'], custid: params['custid'], - custcode: params['custcode'], registersource: params['registersource'], custname: params['custname'], - userid: params['userid'], username: params['username'], useralias: params['useralias'], mobile: params['mobile'], - email: params['email'], productcode: params['productcode'], begintime: params['begintime'], - endtime: params['endtime']) - EcloudService.create(opttype: params['services']['opttype'], code: params['services']['code'], begintime: params['services']['begintime'], - endtime: params['services']['endtime'], ecloud_id: ecloud.try(:id)) - - render :json => {result: true, errmsg: ""} - rescue Exception => e - logger.error(e.message) - render :json => {code: 500, msg: "#{e.message}"} + ActiveRecord::Base.transaction do + begin + ecloud = Ecloud.create!(applyno: params['applyno'], ecordercode: params['ecordercode'], opttype: params['opttype'], + trial: params['trial'], bossorderid: params['bossorderid'], custid: params['custid'], custtype: params['custtype'], + custcode: params['custcode'], registersource: params['registersource'], custname: params['custname'], + userid: params['userid'], username: params['username'], useralias: params['useralias'], mobile: params['mobile'], + email: params['email'], productcode: params['productcode'], begintime: params['begintime'], + endtime: params['endtime']) + services = params['services'].first + EcloudService.create(opttype: services['opttype'], code: services['code'], begintime: services['begintime'], + endtime: services['endtime'], ecloud_id: ecloud.try(:id)) + + render :json => {result: true, errmsg: ""} + rescue Exception => e + logger.error(e.message) + render :json => {code: 500, msg: "#{e.message}"} + raise ActiveRecord::Rollback + end end end # 企业更新 def bs_update - ecloud = Ecloud.where(custid: params['custid']).first - ecloud.update_attribute(applyno: params['applyno'], ecordercode: params['ecordercode'], opttype: params['opttype'], - custid: params['custid'], custcode: params['custcode'], productcode: params['productcode'], - operatime: params['operatime'], effecttime: params['effecttime']) - ecloud.ecloud_services.update_attributes(packagecode: params['services']['packagecode'], bossorderid: params['services']['bossorderid']) - + ActiveRecord::Base.transaction do + begin + ecloud = Ecloud.where(custid: params['custid']).first + ecloud.update_attribute(applyno: params['applyno'], ecordercode: params['ecordercode'], opttype: params['opttype'], + custid: params['custid'], custcode: params['custcode'], productcode: params['productcode'], + operatime: params['operatime'], effecttime: params['effecttime']) + services = params['ervices'].first + ecloud.ecloud_services.update_attributes(packagecode: services['packagecode'], bossorderid: services['bossorderid']) + + rescue Exception => e + logger.error(e.message) + render :json => {code: 500, msg: "#{e.message}"} + raise ActiveRecord::Rollback + end + end end # 用户业务开通接口 @@ -168,7 +182,10 @@ class EcloudController < ApplicationController end private - def ecloudeuser_params - {} + def check_sign + public_key = '1022' + secret_key = '2112037a-6d7a-432b-9081-feb1153d8668' + timestamp = params['timestamp'] + end end diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index bcc12856..54f15c43 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -1,6 +1,6 @@ #encoding: utf-8 class OauthController < ApplicationController - + require include ApplicationHelper before_filter :user_setup diff --git a/app/models/ecloud_service.rb b/app/models/ecloud_service.rb index cc227eb1..596ad684 100644 --- a/app/models/ecloud_service.rb +++ b/app/models/ecloud_service.rb @@ -1,3 +1,3 @@ class EcloudService < ActiveRecord::Base - attr_accessible :begintime, :code, :endtime, :opttype + attr_accessible :begintime, :code, :endtime, :opttype, :ecloud_id, :packagecode, :bossorderid end