diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuOrderController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuOrderController.cs
index 537ec183a..b265324de 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuOrderController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuOrderController.cs
@@ -158,9 +158,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
///
[HttpPost]
[ValidateAntiForgeryToken]
- public ActionResult ExecuteImportExcel(string fileGuid, int chunks, string queryJson)
+ public ActionResult ExecuteImportExcel(string fileGuid, string fileName, int chunks, string queryJson)
{
- string path = annexesFileIBLL.SaveAnnexes(fileGuid, fileGuid, chunks, LoginUserInfo.Get());
+ string path = annexesFileIBLL.SaveAnnexes(fileGuid, fileName, chunks, LoginUserInfo.Get());
if (!string.IsNullOrEmpty(path))
{
DataTable dt = ExcelHelper.ExcelImport(path);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearItemController.cs
index edcd753b2..bd868daaf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearItemController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearItemController.cs
@@ -148,9 +148,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
///
[HttpPost]
[ValidateAntiForgeryToken]
- public ActionResult ExecuteImportExcel(string fileGuid, int chunks, string queryJson)
+ public ActionResult ExecuteImportExcel(string fileGuid, string fileName, int chunks, string queryJson)
{
- string path = annexesFileIBLL.SaveAnnexes(fileGuid, fileGuid, chunks, LoginUserInfo.Get());
+ string path = annexesFileIBLL.SaveAnnexes(fileGuid, fileName, chunks, LoginUserInfo.Get());
if (!string.IsNullOrEmpty(path))
{
DataTable dt = ExcelHelper.ExcelImport(path);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargesStandardController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargesStandardController.cs
index 673b6fa6b..093cea7df 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargesStandardController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargesStandardController.cs
@@ -160,7 +160,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
///
[HttpGet]
[AjaxOnly]
- public ActionResult GetFormData(string majorNo, string syear,string grade)
+ public ActionResult GetFormData(string majorNo, string syear, string grade)
{
var FinaChargesStandardData = finaChargesStandardIBLL.GetFinaChargesStandardListByMajorNo(majorNo, syear, grade);
var jsonData = new
@@ -199,7 +199,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
{
var FinaChargesStandardData = finaChargesStandardIBLL.GetFinaChargesStandardListByMajorNo(majorNo, syear, grade);
- var hasStandardData = FinaChargesStandardData.Where(x => x.ChargeStandardID !="");
+ var hasStandardData = FinaChargesStandardData.Where(x => x.ChargeStandardID != "");
var nohasStandardData = FinaChargesStandardData.Except(hasStandardData);
var hasStandardResult = hasStandardData.Select(x => new
@@ -241,10 +241,10 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
}
[HttpPost]
[AjaxOnly]
- public ActionResult Lock(string deptno, string majorNo, string syear, string grade,string ChargeStandardID)
+ public ActionResult Lock(string deptno, string majorNo, string syear, string grade, string ChargeStandardID)
{
- finaChargesStandardIBLL.Lock(deptno, majorNo, syear, grade, ChargeStandardID);
- return Success_FinaCharge("审核成功!", "收费标准设置", OperationType.Lock, ChargeStandardID,"专业"+majorNo+"年度"+syear+"年级"+grade);
+ finaChargesStandardIBLL.Lock(deptno, majorNo, syear, grade, ChargeStandardID);
+ return Success_FinaCharge("审核成功!", "收费标准设置", OperationType.Lock, ChargeStandardID, "专业" + majorNo + "年度" + syear + "年级" + grade);
}
[HttpPost]
@@ -261,12 +261,12 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
///
[HttpPost]
[AjaxOnly]
- public ActionResult SaveForm(string deptno,string majorNo, string syear, string grade, string strEntity)
+ public ActionResult SaveForm(string deptno, string majorNo, string syear, string grade, string strEntity)
{
var aa = strEntity.ToObject>();
var aaa = aa.Where(x => x.Standard.HasValue && x.Standard.Value > 0).ToList();
- finaChargesStandardIBLL.SaveFinaChargesStandardList(deptno,majorNo, syear, grade, aaa);
- return Success_FinaCharge("保存成功!", "收费标准设置", OperationType.Update, majorNo, "专业" + majorNo + "年度" + syear + "年级" + grade+aaa.ToJson());
+ finaChargesStandardIBLL.SaveFinaChargesStandardList(deptno, majorNo, syear, grade, aaa);
+ return Success_FinaCharge("保存成功!", "收费标准设置", OperationType.Update, majorNo, "专业" + majorNo + "年度" + syear + "年级" + grade + aaa.ToJson());
}
///
@@ -311,9 +311,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
///
[HttpPost]
[ValidateAntiForgeryToken]
- public ActionResult ExecuteImportExcel(string fileGuid, int chunks, string queryJson)
+ public ActionResult ExecuteImportExcel(string fileGuid, string fileName, int chunks, string queryJson)
{
- string path = annexesFileIBLL.SaveAnnexes(fileGuid, fileGuid, chunks, LoginUserInfo.Get());
+ string path = annexesFileIBLL.SaveAnnexes(fileGuid, fileName, chunks, LoginUserInfo.Get());
if (!string.IsNullOrEmpty(path))
{
DataTable dt = ExcelHelper.ExcelImport(path);