From 9e5e515c0bc207d81ced3dbfda1eabf53f5196ed Mon Sep 17 00:00:00 2001 From: liangkun Date: Wed, 10 Aug 2022 18:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=81=E7=94=9F=E7=BC=B4=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuInfoBasic_PayFeeController.cs | 7 ++++ .../Controllers/StuInfoFreshController.cs | 2 +- .../StuInfoBasic_PayFee/InvoiceForm.cshtml | 18 ++++++++++ .../Views/StuInfoBasic_PayFee/InvoiceForm.js | 33 +++++++++++++++++++ .../Views/StuInfoBasic_PayFee/PayFeeIndex.js | 10 +++--- .../Views/StuInfoFresh/InvoiceForm.cshtml | 2 +- .../Learun.Application.Web.csproj | 2 ++ .../StuInfoFresh/StuInfoFreshBLL.cs | 4 +-- .../StuInfoFresh/StuInfoFreshIBLL.cs | 2 +- .../StuInfoFresh/StuInfoFreshService.cs | 31 +++++++++++++---- 10 files changed, 95 insertions(+), 16 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasic_PayFeeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasic_PayFeeController.cs index 6fc11dd7e..466c44f91 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasic_PayFeeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasic_PayFeeController.cs @@ -63,6 +63,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + [HttpGet] + public ActionResult InvoiceForm(string keyValue) + { + var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue, false); + return Success(info); + } #endregion #region 获取数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index 7d798f13f..842453a56 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -190,7 +190,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult InvoiceForm(string keyValue) { - var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue); + var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue,true); return Success(info); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.cshtml new file mode 100644 index 000000000..288e48ebf --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.cshtml @@ -0,0 +1,18 @@ +@{ + ViewBag.Title = "新生缴费管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + +
+ +
+
取消
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js new file mode 100644 index 000000000..6670b48cd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js @@ -0,0 +1,33 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-08-08 17:21 + * 描 述：新生缴费管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + + //取消缴费 + $('#cancelPayFee').click(function () { + learun.layerClose(window.name); + }); + }, + initData: function () { + if (!!keyValue) { + + } + } + }; + + + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js index 11dfa4520..f45089e74 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js @@ -59,10 +59,12 @@ var bootstrap = function ($, learun) { }); //查看发票 $('#lr_viewinvoice').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('StuId'); + var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.PayFeeStatus == "1") { + console.log(selectedRow.InvoiceStatus); + + if (selectedRow.PayStatus == "1" && selectedRow.InvoiceStatus === true) { //查询发票链接 learun.httpAsyncGet( top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, function (res) { @@ -76,12 +78,12 @@ var bootstrap = function ($, learun) { btn: null }); } else { - learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); + learun.alert.warning("当前学生尚未开具发票，请缴费成功后耐心等待！"); return; } }); } else { - learun.alert.warning("当前新生尚未缴费，请缴费成功后耐心等待！"); + learun.alert.warning("当前学生尚未缴费，请缴费成功后耐心等待！"); return; } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.cshtml index 245d01d23..196b0bc0a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.cshtml @@ -8,7 +8,7 @@ }
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index ccb419dc9..8784c354d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1097,6 +1097,7 @@ + @@ -7898,6 +7899,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs index 8e7e856e4..8e32e5404 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs @@ -1013,11 +1013,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue) + public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld) { try { - return stuInfoFreshService.GetStuEnrollFeeOrder(keyValue); + return stuInfoFreshService.GetStuEnrollFeeOrder(keyValue, IsNewOrOld); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs index 477d4d64f..a7a0bce7a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs @@ -255,6 +255,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #endregion - StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue); + StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index 9c571dcb1..180f1a50d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -2089,21 +2089,38 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo #endregion - public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue) + public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue,bool IsNewOrOld) { try { - int dateyear = DateTime.Now.Year; - var stufreshinfo = BaseRepository("CollegeMIS").FindEntity(m=>m.ID==keyValue); - var model = BaseRepository("CollegeMIS").FindEntity(a => a.StuNo == stufreshinfo.StuNo&&a.Status==1&&a.billStatus==true&&!string.IsNullOrEmpty(a.billUrl)&&a.YearNo== dateyear); - if (model != null) + if (IsNewOrOld) { - return model; + var stufreshinfo = BaseRepository("CollegeMIS").FindEntity(m => m.ID == keyValue); + int year =Convert.ToInt32("20" + stufreshinfo.Grade.ToString()); + var model = BaseRepository("CollegeMIS").FindEntity(a => a.StuNo == stufreshinfo.StuNo && a.Status == 1 && a.billStatus == true && !string.IsNullOrEmpty(a.billUrl) && a.YearNo == year); + if (model != null) + { + return model; + } + else + { + return null; + } } else { - return null; + var StuInfoBasic_PayFee =BaseRepository("CollegeMIS").FindEntity(m => m.Id == keyValue); + var model = BaseRepository("CollegeMIS").FindEntity(a => a.StuNo == StuInfoBasic_PayFee.StuNo && a.Status == 1 && a.billStatus == true && !string.IsNullOrEmpty(a.billUrl) && a.YearNo == StuInfoBasic_PayFee.PayYear); + if (model != null) + { + return model; + } + else + { + return null; + } } + } catch (Exception ex) {