@@ -914,6 +914,29 @@ namespace Learun.Application.Organization | |||||
} | } | ||||
} | } | ||||
} | } | ||||
public void FirstRevisePassword(string password) | |||||
{ | |||||
try | |||||
{ | |||||
UserInfo userInfo = LoginUserInfo.Get(); | |||||
cache.Remove(cacheKeyId + userInfo.userId, CacheId.user); | |||||
cache.Remove(cacheKeyAccount + userInfo.account, CacheId.user); | |||||
userService.RevisePassword(userInfo.userId, password); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowBusinessException(ex); | |||||
} | |||||
} | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 重置密码 | /// 重置密码 | ||||
/// </summary> | /// </summary> | ||||
@@ -210,5 +210,11 @@ namespace Learun.Application.Organization | |||||
/// <param name="oldPassword"></param> | /// <param name="oldPassword"></param> | ||||
/// <returns></returns> | /// <returns></returns> | ||||
bool RevisePasswordiden(string newPassword, string oldPassword); | bool RevisePasswordiden(string newPassword, string oldPassword); | ||||
/// <summary> | |||||
/// 直接修改密码 | |||||
/// </summary> | |||||
/// <param name="password"></param> | |||||
void FirstRevisePassword(string password); | |||||
} | } | ||||
} | } |
@@ -629,11 +629,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
/// <returns></returns> | /// <returns></returns> | ||||
[HttpGet] | [HttpGet] | ||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetPayFeeDetail(string keyValue) | |||||
public ActionResult GetPayFeeDetail(string keyValue,int jiaoFeiYear=0) | |||||
{ | { | ||||
if (jiaoFeiYear==0) | |||||
{ | |||||
jiaoFeiYear = DateTime.Now.Year; | |||||
} | |||||
var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntity(keyValue); | var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntity(keyValue); | ||||
var stuInfoFreshFamily = stuInfoFreshIBLL.GetStuInfoFreshFamilyList(keyValue); | |||||
//当前年度缴费记录 | //当前年度缴费记录 | ||||
var FeeOrderList = stuInfoFreshIBLL.GetFeeOrderList(StuInfoFreshData.StuNo, DateTime.Now.Year); | |||||
var FeeOrderList = stuInfoFreshIBLL.GetFeeOrderList(StuInfoFreshData.StuNo, jiaoFeiYear); | |||||
var FinaChargesStandardList = new List<FinaChargesStandardEntity>(); | var FinaChargesStandardList = new List<FinaChargesStandardEntity>(); | ||||
if (!string.IsNullOrEmpty(StuInfoFreshData.ClassNo) && !string.IsNullOrEmpty(StuInfoFreshData.MajorNo)) | if (!string.IsNullOrEmpty(StuInfoFreshData.ClassNo) && !string.IsNullOrEmpty(StuInfoFreshData.MajorNo)) | ||||
{ | { | ||||
@@ -641,7 +646,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
if (ClassInfoEntity != null) | if (ClassInfoEntity != null) | ||||
{ | { | ||||
var academicAndYear = Common.GetSemesterAndYear(); | var academicAndYear = Common.GetSemesterAndYear(); | ||||
FinaChargesStandardList = finaChargesStandardIBLL.GetFinaChargesStandardListByMajorNoOfNotAll(StuInfoFreshData.MajorNo, academicAndYear.AcademicYearShort, academicAndYear.Semester, ClassInfoEntity.Grade).ToList(); | |||||
FinaChargesStandardList = finaChargesStandardIBLL.GetFinaChargesStandardListByYongYou(StuInfoFreshData.StuNo, jiaoFeiYear).ToList(); | |||||
} | } | ||||
} | } | ||||
var PayFeeTotal = FinaChargesStandardList.Select(x => x.Standard).Sum(); | var PayFeeTotal = FinaChargesStandardList.Select(x => x.Standard).Sum(); | ||||
@@ -649,6 +654,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
{ | { | ||||
StuInfoFreshData = StuInfoFreshData, | StuInfoFreshData = StuInfoFreshData, | ||||
FinaChargesStandardList = FinaChargesStandardList, | FinaChargesStandardList = FinaChargesStandardList, | ||||
StuInfoFreshFamilyList= stuInfoFreshFamily, | |||||
PayFeeTotal = PayFeeTotal, | PayFeeTotal = PayFeeTotal, | ||||
YJAmount = FeeOrderList.Sum(x => x.SJAmount) | YJAmount = FeeOrderList.Sum(x => x.SJAmount) | ||||
}; | }; | ||||
@@ -40,7 +40,7 @@ | |||||
<table class="table table-bordered" id="PayFeeDetail"></table> | <table class="table table-bordered" id="PayFeeDetail"></table> | ||||
<div id="btnBox"> | <div id="btnBox"> | ||||
<div id="confirmPayFee" class="btn btn-primary">支付</div> | <div id="confirmPayFee" class="btn btn-primary">支付</div> | ||||
@*<div id="searchPayFee" class="btn btn-success">查询</div>*@ | |||||
<div id="searchPayFee" class="btn btn-success">查询</div> | |||||
<div id="cancelPayFee" class="btn btn-default">取消</div> | <div id="cancelPayFee" class="btn btn-default">取消</div> | ||||
</div> | </div> | ||||
</div> | </div> |
@@ -17,6 +17,9 @@ var bootstrap = function ($, learun) { | |||||
page.initData(); | page.initData(); | ||||
}, | }, | ||||
bind: function () { | bind: function () { | ||||
$('#searchPayFee').click(function() { | |||||
}); | |||||
//获取缴费二维码 | //获取缴费二维码 | ||||
$('#confirmPayFee').click(function () { | $('#confirmPayFee').click(function () { | ||||
if (parseFloat($('#PayMoney').html()) > PayFeeTotal) { | if (parseFloat($('#PayMoney').html()) > PayFeeTotal) { | ||||
@@ -62,8 +65,14 @@ var bootstrap = function ($, learun) { | |||||
initData: function () { | initData: function () { | ||||
if (!!keyValue) { | if (!!keyValue) { | ||||
$.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetPayFeeDetail?keyValue=' + keyValue, function (data) { | $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetPayFeeDetail?keyValue=' + keyValue, function (data) { | ||||
if (data['StuInfoFreshFamilyList'].length == 0) { | |||||
learun.alert.warning("检测到还未完善新生信息!请先完善新生信息。"); | |||||
learun.layerClose(window.name); | |||||
return; | |||||
} | |||||
if (data['FinaChargesStandardList'].length == 0) { | if (data['FinaChargesStandardList'].length == 0) { | ||||
learun.alert.warning("检测到还未维护该专业收费标准!请先维护该专业收费标准。"); | learun.alert.warning("检测到还未维护该专业收费标准!请先维护该专业收费标准。"); | ||||
learun.layerClose(window.name); | |||||
return; | return; | ||||
} | } | ||||
var StuInfoFresh = data['StuInfoFreshData']; | var StuInfoFresh = data['StuInfoFreshData']; | ||||
@@ -62,6 +62,11 @@ namespace Learun.Application.Web.Controllers | |||||
private EmailSendIBLL emailSendIBLL = new EmailSendBLL(); | private EmailSendIBLL emailSendIBLL = new EmailSendBLL(); | ||||
#region 视图功能 | #region 视图功能 | ||||
public ActionResult FirstChangePwd() | |||||
{ | |||||
return View(); | |||||
} | |||||
public ActionResult ChangePwd() | public ActionResult ChangePwd() | ||||
{ | { | ||||
return View(); | return View(); | ||||
@@ -353,6 +353,17 @@ namespace Learun.Application.Web.Controllers | |||||
OperatorHelper.Instance.EmptyCurrent(); | OperatorHelper.Instance.EmptyCurrent(); | ||||
return Success("密码修改成功,请牢记新密码。\r 将会自动安全退出。"); | return Success("密码修改成功,请牢记新密码。\r 将会自动安全退出。"); | ||||
} | } | ||||
[HttpPost] | |||||
[AjaxOnly] | |||||
public ActionResult FirstSubmitResetPasswordNoCode(string password) | |||||
{ | |||||
userIBLL.FirstRevisePassword(password); | |||||
Session.Abandon(); | |||||
Session.Clear(); | |||||
OperatorHelper.Instance.EmptyCurrent(); | |||||
return Success("密码修改成功,请牢记新密码。\r 将会自动安全退出。"); | |||||
} | |||||
#endregion | #endregion | ||||
} | } | ||||
} | } |
@@ -4013,6 +4013,7 @@ | |||||
<Content Include="Views\Home\AdminTop\Index.js" /> | <Content Include="Views\Home\AdminTop\Index.js" /> | ||||
<Content Include="Views\Home\AdminWindos\Index.css" /> | <Content Include="Views\Home\AdminWindos\Index.css" /> | ||||
<Content Include="Views\Home\AdminWindos\Index.js" /> | <Content Include="Views\Home\AdminWindos\Index.js" /> | ||||
<Content Include="Views\Home\FirstChangePwd.js" /> | |||||
<Content Include="Views\Home\DataBaseInit.js" /> | <Content Include="Views\Home\DataBaseInit.js" /> | ||||
<Content Include="Views\Home\ChangePwd.js" /> | <Content Include="Views\Home\ChangePwd.js" /> | ||||
<Content Include="Views\Home\NeedToDoForm.js" /> | <Content Include="Views\Home\NeedToDoForm.js" /> | ||||
@@ -7831,6 +7832,7 @@ | |||||
<None Include="Properties\PublishProfiles\learunadms6.1.pubxml" /> | <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" /> | ||||
<Content Include="Views\Login\First.cshtml" /> | <Content Include="Views\Login\First.cshtml" /> | ||||
<Content Include="Views\Login\FirstLoginForWeixin.cshtml" /> | <Content Include="Views\Login\FirstLoginForWeixin.cshtml" /> | ||||
<Content Include="Views\Home\FirstChangePwd.cshtml" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<WCFMetadata Include="Connected Services\" /> | <WCFMetadata Include="Connected Services\" /> | ||||
@@ -226,6 +226,34 @@ var bootstrap = function ($, learun) { | |||||
} | } | ||||
}); | }); | ||||
} | } | ||||
if (pwd == "first") { | |||||
top.layer.open({ | |||||
id: 'pwdform', | |||||
title: '密码修改', | |||||
closeBtn: 0, | |||||
resize: false, | |||||
type: 2, | |||||
skin: 'lr-layer', | |||||
btn: ['确定'], | |||||
content: top.$.rootUrl + '/Home/FirstChangePwd', | |||||
area: ['500px', '300px'], | |||||
success: function (layero, index) { | |||||
top['layer_pwdform'] = learun.iframe($(layero).find('iframe').attr('id'), top.frames); | |||||
layero[0].learun_layerid = 'layer_pwdform'; | |||||
}, | |||||
yes: function (index, layero) { | |||||
var flag = top['layer_pwdform'].acceptClick(function () { | |||||
top.location.href = "/Login/Index"; | |||||
}); | |||||
if (!!flag) { | |||||
learun.layerClose('', index); | |||||
} | |||||
}, | |||||
end: function () { | |||||
top['layer_pwdform'] = null; | |||||
} | |||||
}); | |||||
} | |||||
//30天未修改密码进行提示 | //30天未修改密码进行提示 | ||||
if (pwdtip == "true") { | if (pwdtip == "true") { | ||||
layer.alert("您已30天未修改密码,请先修改!", {icon:7, title: "提示", yes: function (index) { layer.close(index) } }); | layer.alert("您已30天未修改密码,请先修改!", {icon:7, title: "提示", yes: function (index) { layer.close(index) } }); | ||||
@@ -0,0 +1,20 @@ | |||||
@{ | |||||
ViewBag.Title = "课程类型"; | |||||
Layout = "~/Views/Shared/_Form.cshtml"; | |||||
} | |||||
<div class="lr-form-wrap"> | |||||
<div class="col-xs-12 lr-form-item" data-table="ChangePwd"> | |||||
<div class="lr-form-item-title">新密码<font face="宋体">*</font></div> | |||||
<input id="NewPwd" type="password" class="form-control" isvalid="yes" checkexpession="StrongPwd" /> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item" data-table="ChangePwd"> | |||||
<div class="lr-form-item-title">确认密码<font face="宋体">*</font></div> | |||||
<input id="NewPwd2" type="password" class="form-control" isvalid="yes" checkexpession="NotNull" /> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item" data-table="ChangePwd"> | |||||
<div class="lr-form-item-title"></div> | |||||
您的密码不满足强度要求,请您先修改密码后再执行系统其他操作! | |||||
新密码必须8-20位同时包含1.[大小写字母]、2[数字]、3[特殊符号!@@#$%^&*] | |||||
</div> | |||||
</div> | |||||
@Html.AppendJsFile("/Views/Home/FirstChangePwd.js") |
@@ -0,0 +1,51 @@ | |||||
/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) | |||||
* Copyright (c) 2013-2018 北京泉江科技有限公司 | |||||
* 创建人:超级管理员 | |||||
* 日 期:2019-07-18 15:18 | |||||
* 描 述:课程类型 | |||||
*/ | |||||
var acceptClick; | |||||
var keyValue = request('keyValue'); | |||||
var bootstrap = function ($, learun) { | |||||
"use strict"; | |||||
var page = { | |||||
init: function () { | |||||
$('.lr-form-wrap').lrscroll(); | |||||
page.bind(); | |||||
}, | |||||
bind: function () { | |||||
$("#NewPwd2").blur(function () { | |||||
var $this = $(this); | |||||
if ($this.val() == "") { | |||||
return false; | |||||
} | |||||
if ($this.val() != $('#NewPwd').val()) { | |||||
learun.alert.error("两次密码输入不一样"); | |||||
} | |||||
}); | |||||
} | |||||
}; | |||||
// 保存数据 | |||||
acceptClick = function (callBack) { | |||||
if (!$('body').lrValidform()) { | |||||
return false; | |||||
} | |||||
if ($("#NewPwd2").val() != $('#NewPwd').val()) { | |||||
learun.alert.error("两次密码输入不一样"); | |||||
return false; | |||||
} | |||||
var formData = $('body').lrGetFormData(); | |||||
var postData = { | |||||
password: $.md5(formData.NewPwd) | |||||
}; | |||||
$.lrSaveForm(top.$.rootUrl + '/UserCenter/FirstSubmitResetPasswordNoCode', postData, function (res) { | |||||
if (res.code == 200) { | |||||
// 保存成功后才回调 | |||||
if (!!callBack) { | |||||
callBack(); | |||||
} | |||||
} | |||||
}); | |||||
}; | |||||
page.init(); | |||||
} |
@@ -150,13 +150,13 @@ | |||||
success: function (res) { | success: function (res) { | ||||
if (res.code == 200) { | if (res.code == 200) { | ||||
if (source == "noLogin") { | if (source == "noLogin") { | ||||
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index"; | |||||
window.location.href = "/SSOSystem/Index"; | |||||
} else { | } else { | ||||
if (res.data.pwd == true) { | if (res.data.pwd == true) { | ||||
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true"; | |||||
window.location.href = "/Home/Index?pwd=first"; | |||||
} | } | ||||
else { | else { | ||||
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index"; | |||||
window.location.href = "/Home/Index"; | |||||
} | } | ||||
} | } | ||||
} | } | ||||
@@ -1,46 +1,49 @@ | |||||
<?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||
<connectionStrings> | <connectionStrings> | ||||
<!--本机--> | |||||
<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" /> | |||||
<!--本机--> | |||||
<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" /> | |||||
<add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />--> | <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />--> | ||||
<!--126--> | |||||
<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" /> | |||||
<!--126--> | |||||
<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" /> | |||||
<add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />--> | <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />--> | ||||
<!--西昌--> | |||||
<!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" /> | |||||
<!--西昌--> | |||||
<!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" /> | |||||
<add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />--> | <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />--> | ||||
<!--demo.quanjiang.com--> | |||||
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | |||||
<!--demo.quanjiang.com--> | |||||
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | |||||
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />--> | <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />--> | ||||
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | |||||
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | |||||
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | ||||
--><!--获取网上缴费数据--><!-- | |||||
--> | |||||
<!--获取网上缴费数据--> | |||||
<!-- | |||||
<add name="IsPay" connectionString="Server=192.168.53.19;Initial Catalog=u8gx;User ID=jfcx;Password=xcyz1234567." providerName="System.Data.SqlClient" />--> | <add name="IsPay" connectionString="Server=192.168.53.19;Initial Catalog=u8gx;User ID=jfcx;Password=xcyz1234567." providerName="System.Data.SqlClient" />--> | ||||
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | |||||
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | |||||
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />--> | <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />--> | ||||
<!--金隅--> | |||||
<!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" /> | |||||
<!--金隅--> | |||||
<!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" /> | |||||
<add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />--> | <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />--> | ||||
<!--126西昌测试--> | |||||
<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" /> | |||||
<!--126西昌测试--> | |||||
<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" /> | |||||
<add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />--> | <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />--> | ||||
<!--测试公共提交--> | |||||
<!--塔里木测试--> | |||||
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | |||||
<!--测试公共提交--> | |||||
<!--塔里木测试--> | |||||
<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | |||||
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />--> | <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />--> | ||||
<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | ||||
<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | ||||
<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" /> | ||||
<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" /> | <add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" /> | ||||
<add name="YongyouDb" connectionString="Server=192.168.53.19,1433;Password=sa123456.;User ID=sa; Initial Catalog=u8gx" providerName="System.Data.SqlClient" /> | |||||
</connectionStrings> | </connectionStrings> |
@@ -154,7 +154,7 @@ | |||||
<add key="ACIp" value="192.168.90.2"/> | <add key="ACIp" value="192.168.90.2"/> | ||||
<add key="ACIp2" value="192.168.200.252"/> | <add key="ACIp2" value="192.168.200.252"/> | ||||
<!-- 是否强制验证强密码 --> | <!-- 是否强制验证强密码 --> | ||||
<add key="verifypwd" value="false"/> | |||||
<add key="verifypwd" value="true"/> | |||||
<!--疫情防控组角色Id--> | <!--疫情防控组角色Id--> | ||||
<add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" /> | <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" /> | ||||
<!--注册教师生成编号 金隅:jy;西昌:xc;大厂:dc--> | <!--注册教师生成编号 金隅:jy;西昌:xc;大厂:dc--> | ||||
@@ -294,6 +294,26 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement | |||||
} | } | ||||
} | } | ||||
} | } | ||||
public IEnumerable<FinaChargesStandardEntity> GetFinaChargesStandardListByYongYou(string stuNo, int jiaoFeiYear) | |||||
{ | |||||
try | |||||
{ | |||||
return finaChargesStandardService.GetFinaChargesStandardListByYongYou(stuNo, jiaoFeiYear); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowBusinessException(ex); | |||||
} | |||||
} | |||||
} | |||||
#endregion | #endregion | ||||
} | } | ||||
@@ -99,5 +99,6 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement | |||||
bool IsChargeByMajorNo(string majorNo, string academicYearNo, string semester, string grade); | bool IsChargeByMajorNo(string majorNo, string academicYearNo, string semester, string grade); | ||||
#endregion | #endregion | ||||
IEnumerable<FinaChargesStandardEntity> GetFinaChargesStandardListByYongYou(string stuNo, int jiaoFeiYear); | |||||
} | } | ||||
} | } |
@@ -420,5 +420,31 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement | |||||
} | } | ||||
#endregion | #endregion | ||||
public IEnumerable<FinaChargesStandardEntity> GetFinaChargesStandardListByYongYou(string stuNo, int jiaoFeiYear) | |||||
{ | |||||
try | |||||
{ | |||||
IEnumerable<FinaChargesStandardEntity> yylist = BaseRepository("YongyouDb").FindList<FinaChargesStandardEntity>("select ISNULL(A.YJJE,0) as YJJE,s.*,s1.SFND,ISNULL(s1.YSJE,0) AS YSJE,ISNULL(s1.SFXMDM,'') AS SFXMDM,isnull(sf.SFXMMC,'-2') AS SFXMMC,s2.SFXMDM DAI,ISNULL(s2.JE,0) JE " + | |||||
"from SCS_XSXX s left join SCS_YSK s1 on s.XSID=s1.XSID and s1.SFND in (" + jiaoFeiYear + " ) " + | |||||
"left join SCS_SFXM sf on sf.SFXMDM=s1.SFXMDM and sf.KJND=" + DateTime.Now.Year + " and sf.SFXMMC is not null " + | |||||
"left join (select O.XSID,O1.SFXMDM,sum(O1.JE) as JE from SCS_ORDER o inner join SCS_ORDEL o1 on o1.OR_ID=o.OR_ID group by O.XSID,O1.SFXMDM) as s2 on s2.XSID=s1.XSID AND S1.SFXMDM=S2.SFXMDM " + | |||||
"LEFT JOIN (SELECT SUM(JE) YJJE,SFND,B.SFXMDM FROM SCS_SFD_MX A LEFT JOIN SCS_SFXM B ON A.SFND=B.KJND AND A.SFXMDM=B.SFXMDM " + | |||||
"INNER JOIN SCS_SFD_ML C ON C.DJNM = A.DJNM INNER JOIN SCS_XSXX D ON D.XSID = C.XSID " + | |||||
"WHERE D.XH='" + stuNo + "' AND SFND in (" + jiaoFeiYear + " ) AND (C.DJLY<>'订单' OR C.DJLY IS NULL) GROUP BY SFND, B.SFXMDM) A ON A.SFXMDM = sf.SFXMDM " + | |||||
"where s.XH='" + stuNo + "'"); | |||||
return yylist; | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowServiceException(ex); | |||||
} | |||||
} | |||||
} | |||||
} | } | ||||
} | } |