From 1c4064aa704d6c188128e88eceb4469f465735f7 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Mon, 8 Jul 2024 14:03:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E7=AE=A1=E7=90=86=EF=BC=9A=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=E7=9A=84=E5=8F=82=E6=95=B0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinaChargeStuOrderController.cs | 4 ++-- .../FinaChargeStuYearItemController.cs | 4 ++-- .../FinaChargesStandardController.cs | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) 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);