From 77742e834b475addfa1a464eac15fe5639330711 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 23 Aug 2022 10:17:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E7=94=9F=E8=80=81=E7=94=9F?= =?UTF-8?q?=E7=BC=B4=E8=B4=B9--=E6=9F=A5=E7=9C=8B=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuInfoBasic_PayFeeController.cs | 34 +++++++++----- .../Controllers/StuInfoFreshController.cs | 19 ++++++-- .../StuInfoBasic_PayFee/InvoiceForm.cshtml | 11 ++--- .../Views/StuInfoBasic_PayFee/InvoiceForm.js | 25 +++++++++-- .../Views/StuInfoBasic_PayFee/PayFeeIndex.js | 42 +++++++++++------- .../Views/StuInfoFresh/InvoiceForm.cshtml | 11 ++++- .../Views/StuInfoFresh/InvoiceForm.js | 22 +++++++++- .../Views/StuInfoFresh/PayFeeIndex.js | 42 +++++++++++------- .../StuEnrollInvoiceRecordMap.cs | 22 ++++++++++ .../Learun.Application.Mapping.csproj | 1 + .../StuEnrollInvoiceRecordEntity.cs | 44 +++++++++++++++++++ .../StuInfoFresh/StuInfoFreshBLL.cs | 2 +- .../StuInfoFresh/StuInfoFreshIBLL.cs | 2 +- .../StuInfoFresh/StuInfoFreshService.cs | 12 +++-- .../Learun.Application.TwoDevelopment.csproj | 1 + 15 files changed, 222 insertions(+), 68 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuEnrollInvoiceRecordMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollInvoiceRecord/StuEnrollInvoiceRecordEntity.cs 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 72b3f6c7c..b74450b63 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 @@ -40,25 +40,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } [HttpGet] public ActionResult PayFeeIndex() { - return View(); + return View(); } [HttpGet] public ActionResult PayFeeIndexForStu() { - return View("PayFeeIndex"); + return View("PayFeeIndex"); } [HttpGet] public ActionResult PayFeeForm() { - return View(); + return View(); } /// /// 表单页 @@ -67,19 +67,30 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } [HttpGet] - public ActionResult InvoiceForm(string keyValue) + public ActionResult InvoiceForm() { - var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue, false); - return Success(info); + return View(); } #endregion #region 获取数据 + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetInvoiceRecord(string keyValue) + { + var list = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue, false); + return Success(list); + } /// /// 获取页面显示列表数据 /// @@ -110,8 +121,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var StuInfoBasic_PayFeeData = stuInfoBasic_PayFeeIBLL.GetStuInfoBasic_PayFeeEntity( keyValue ); - var jsonData = new { + var StuInfoBasic_PayFeeData = stuInfoBasic_PayFeeIBLL.GetStuInfoBasic_PayFeeEntity(keyValue); + var jsonData = new + { StuInfoBasic_PayFee = StuInfoBasic_PayFeeData, }; return Success(jsonData); @@ -291,7 +303,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult SaveForm(string strEntity) { StuInfoBasic_PayFeeEntity entity = strEntity.ToObject(); - stuInfoBasic_PayFeeIBLL.SaveEntity("",entity); + stuInfoBasic_PayFeeIBLL.SaveEntity("", entity); return Success("初始化成功！"); } #endregion 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 735cc811c..2b16551e5 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 @@ -194,10 +194,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } [HttpGet] - public ActionResult InvoiceForm(string keyValue) + public ActionResult InvoiceForm() { - var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue,true); - return Success(info); + //var list = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue,true); + //return Success(list); + return View(); } /// /// 助学贷款表单页 @@ -309,7 +310,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { stuInfoFreshIBLL.SynchronousList(); } - + /// + /// 获取列表数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetInvoiceRecord(string keyValue) + { + var list = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue, true); + return Success(list); + } /// /// 获取列表数据 /// 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 index 288e48ebf..4b098158c 100644 --- 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 @@ -7,12 +7,9 @@ text-align: center; } -
- -
-
取消
-
+
+ +
+
@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 index 6670b48cd..100439d5d 100644 --- 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 @@ -5,7 +5,7 @@ * 描 述：新生缴费管理 */ var acceptClick; -var keyValue = request('keyValue'); +var keyValue = '0003FFA0-23B8-4345-A020-E0DCBD2535EB';// request('keyValue'); var bootstrap = function ($, learun) { "use strict"; var page = { @@ -15,7 +15,9 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - + $('#lr_form_tabs').lrFormTab(); + $('#lr_form_tabs ul li').eq(0).trigger('click'); + //取消缴费 $('#cancelPayFee').click(function () { learun.layerClose(window.name); @@ -23,7 +25,24 @@ var bootstrap = function ($, learun) { }, initData: function () { if (!!keyValue) { - + learun.httpAsyncGet( + top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/GetInvoiceRecord?keyValue=' + keyValue, function (res) { + if (!!res.data) { + var ulHtml = ""; + var contentHtml = ""; + for (var i = 0; i < res.data.length; i++) { + ulHtml += '
  • 票据' + (i + 1) + '
    • '; + contentHtml += '
    '; + contentHtml += ''; + contentHtml += '
    '; + } + $('#tabul').html(ulHtml); + $('#lr_tab_content').html(contentHtml); + } else { + learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); + return; + } + }); } } }; 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 3ff6176c9..d6944af09 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 @@ -65,23 +65,31 @@ var bootstrap = function ($, learun) { console.log(selectedRow.InvoiceStatus); if (selectedRow.PayStatus == "1" && selectedRow.InvoiceStatus === true) { - //查询发票链接 - learun.httpAsyncGet( - top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, function (res) { - if (!!res.data && !!res.data.billUrl) { - learun.layerForm({ - id: 'form_invoice', - title: '查看发票', - url: res.data.billUrl, - width: 1000, - height: 600, - btn: null - }); - } else { - learun.alert.warning("当前学生尚未开具发票，请缴费成功后耐心等待！"); - return; - } - }); + learun.layerForm({ + id: 'form_invoice', + title: '查看发票', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, + width: 1000, + height: 600, + btn: null + }); + ////查询发票链接 + //learun.httpAsyncGet( + // top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, function (res) { + // if (!!res.data && !!res.data.billUrl) { + // learun.layerForm({ + // id: 'form_invoice', + // title: '查看发票', + // url: res.data.billUrl, + // width: 1000, + // height: 600, + // btn: null + // }); + // } else { + // learun.alert.warning("当前学生尚未开具发票，请缴费成功后耐心等待！"); + // return; + // } + // }); } else { 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 196b0bc0a..47b496eed 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 @@ -7,12 +7,19 @@ text-align: center; } -
    +@*
    取消
    +
    *@ +
    +
    -@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js") \ No newline at end of file +
    +
    + + @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js index 6670b48cd..d6bc2708f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js @@ -15,7 +15,8 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - + $('#lr_form_tabs').lrFormTab(); + $('#lr_form_tabs ul li').eq(0).trigger('click'); //取消缴费 $('#cancelPayFee').click(function () { learun.layerClose(window.name); @@ -23,7 +24,24 @@ var bootstrap = function ($, learun) { }, initData: function () { if (!!keyValue) { - + learun.httpAsyncGet( + top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetInvoiceRecord?keyValue=' + keyValue, function (res) { + if (!!res.data) { + var ulHtml = ""; + var contentHtml = ""; + for (var i = 0; i < res.data.length; i++) { + ulHtml += '
  • 票据' + (i + 1) + '
    • '; + contentHtml += '
    '; + contentHtml += ''; + contentHtml += '
    '; + } + $('#tabul').html(ulHtml); + $('#lr_tab_content').html(contentHtml); + } else { + learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); + return; + } + }); } } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index 682d8904d..4e4bac301 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -64,23 +64,31 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.PayFeeStatus == "1") { - //查询发票链接 - learun.httpAsyncGet( - top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, function (res) { - if (!!res.data && !!res.data.billUrl) { - learun.layerForm({ - id: 'form_invoice', - title: '查看发票', - url: res.data.billUrl, - width: 1000, - height: 600, - btn: null - }); - } else { - learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); - return; - } - }); + learun.layerForm({ + id: 'form_invoice', + title: '查看发票', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, + width: 1000, + height: 600, + btn: null + }); + ////查询发票链接 + //learun.httpAsyncGet( + // top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, function (res) { + // if (!!res.data && !!res.data.billUrl) { + // learun.layerForm({ + // id: 'form_invoice', + // title: '查看发票', + // url: res.data.billUrl, + // width: 1000, + // height: 600, + // btn: null + // }); + // } else { + // learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); + // return; + // } + // }); } else { learun.alert.warning("当前新生尚未缴费，请缴费成功后耐心等待！"); return; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuEnrollInvoiceRecordMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuEnrollInvoiceRecordMap.cs new file mode 100644 index 000000000..d519e5cec --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuEnrollInvoiceRecordMap.cs @@ -0,0 +1,22 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + public class StuEnrollInvoiceRecordMap : EntityTypeConfiguration + { + public StuEnrollInvoiceRecordMap() + { + #region 表、主键 + //表 + this.ToTable("STUENROLLINVOICERECORD"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 3481c2c3c..1f02a015f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -67,6 +67,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollInvoiceRecord/StuEnrollInvoiceRecordEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollInvoiceRecord/StuEnrollInvoiceRecordEntity.cs new file mode 100644 index 000000000..59a926fdd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollInvoiceRecord/StuEnrollInvoiceRecordEntity.cs @@ -0,0 +1,44 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 新生缴费单 + /// + public class StuEnrollInvoiceRecordEntity + { + #region 实体成员 + public string Id { get; set; } + public int? YearNo { get; set; } + public string StuNo { get; set; } + public string billNo { get; set; } + public string random { get; set; } + public bool? billStatus { get; set; } + public string billUrl { get; set; } + + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + 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 323bbb315..3b2fe7410 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,7 +1013,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld) + public IEnumerable GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld) { try { 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 95bb8df9b..3d834bb6a 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,7 +255,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #endregion - StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld); + IEnumerable GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld); void SaveStudentCompare(string identityCardNo, int photoCheckStatus, string identPhoto, string scenePhoto); } } 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 aea94072e..c051688be 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,7 +2089,13 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo #endregion - public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld) + /// + /// 查询学生票据 + /// + /// + /// + /// + public IEnumerable GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld) { try { @@ -2097,7 +2103,7 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo { 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); + var model = BaseRepository("CollegeMIS").FindList(a => a.StuNo == stufreshinfo.StuNo && !string.IsNullOrEmpty(a.billUrl) && a.YearNo == year); if (model != null) { return model; @@ -2110,7 +2116,7 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo else { 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); + var model = BaseRepository("CollegeMIS").FindList(a => a.StuNo == StuInfoBasic_PayFee.StuNo && !string.IsNullOrEmpty(a.billUrl) && a.YearNo == StuInfoBasic_PayFee.PayYear); if (model != null) { return model; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index b1e607d36..16ff04be9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -218,6 +218,7 @@ + From 6fdc16d6e836b92b26d3b3d298baa0d5ebea7fa2 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 23 Aug 2022 11:55:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic_PayFee/PayFeeIndex.js | 54 +++++++++---------- .../Views/StuInfoFresh/PayFeeIndex.js | 50 ++++++++--------- 2 files changed, 52 insertions(+), 52 deletions(-) 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 d6944af09..66a16e64b 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 @@ -62,34 +62,34 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - console.log(selectedRow.InvoiceStatus); + //console.log(selectedRow.InvoiceStatus); if (selectedRow.PayStatus == "1" && selectedRow.InvoiceStatus === true) { - learun.layerForm({ - id: 'form_invoice', - title: '查看发票', - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, - width: 1000, - height: 600, - btn: null - }); - ////查询发票链接 - //learun.httpAsyncGet( - // top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, function (res) { - // if (!!res.data && !!res.data.billUrl) { - // learun.layerForm({ - // id: 'form_invoice', - // title: '查看发票', - // url: res.data.billUrl, - // width: 1000, - // height: 600, - // btn: null - // }); - // } else { - // learun.alert.warning("当前学生尚未开具发票，请缴费成功后耐心等待！"); - // return; - // } - // }); + //查询发票链接 + learun.httpAsyncGet( + top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/GetInvoiceRecord?keyValue=' + keyValue, function (res) { + if (!!res.data && res.data.length > 0) { + learun.layerForm({ + id: 'form_invoice', + title: '查看发票', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, + width: 1000, + height: 600, + btn: null + }); + //learun.layerForm({ + // id: 'form_invoice', + // title: '查看发票', + // url: res.data.billUrl, + // width: 1000, + // height: 600, + // btn: null + //}); + } else { + learun.alert.warning("当前学生尚未开具发票，请缴费成功后耐心等待！"); + return; + } + }); } else { learun.alert.warning("当前学生尚未缴费，请缴费成功后耐心等待！"); return; @@ -174,7 +174,7 @@ var bootstrap = function ($, learun) { ], mainId: 'Id', isPage: true, - sidx:'DeptNo' + sidx: 'DeptNo' }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index 4e4bac301..3ce4239e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -64,31 +64,31 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.PayFeeStatus == "1") { - learun.layerForm({ - id: 'form_invoice', - title: '查看发票', - url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, - width: 1000, - height: 600, - btn: null - }); - ////查询发票链接 - //learun.httpAsyncGet( - // top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, function (res) { - // if (!!res.data && !!res.data.billUrl) { - // learun.layerForm({ - // id: 'form_invoice', - // title: '查看发票', - // url: res.data.billUrl, - // width: 1000, - // height: 600, - // btn: null - // }); - // } else { - // learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); - // return; - // } - // }); + //查询发票链接 + learun.httpAsyncGet( + top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetInvoiceRecord?keyValue=' + keyValue, function (res) { + if (!!res.data && res.data.length > 0) { + learun.layerForm({ + id: 'form_invoice', + title: '查看发票', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, + width: 1000, + height: 600, + btn: null + }); + //learun.layerForm({ + // id: 'form_invoice', + // title: '查看发票', + // url: res.data.billUrl, + // width: 1000, + // height: 600, + // btn: null + //}); + } else { + learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); + return; + } + }); } else { learun.alert.warning("当前新生尚未缴费，请缴费成功后耐心等待！"); return;