From 2554e34a738d2ab40bc4d20112c530447acb2cff Mon Sep 17 00:00:00 2001 From: fzp <645608524@qq.com> Date: Sat, 19 Aug 2023 18:25:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/FinaChargeRefund/Index.cshtml | 16 +++- .../Views/FinaChargeRefund/Index.js | 90 +++++++++++++------ .../FinaChargeRefundEntity.cs | 11 +++ .../FinaChargeRefundService.cs | 23 ++--- 4 files changed, 98 insertions(+), 42 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.cshtml index a8749cedc..1205fe05a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.cshtml @@ -11,12 +11,20 @@
-
收费项目编号
- +
学号
+
-
收费项目名称
- +
姓名
+ +
+
+
项目编号
+ +
+
+
项目名称
+
退费方式
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.js index 6bc1f04ca..06b371226 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#RType').lrDataItemSelect({ code: 'RefundStatus' }); + $('#RType').lrDataItemSelect({ code: 'RType' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -56,7 +56,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } @@ -66,41 +66,75 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/GetPageList', headData: [ - { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left"}, - { label: "收费项目名称", name: "ChargeItemName", width: 100, align: "left"}, - { label: "收费项目类型", name: "ChargeItemType", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'ChargeItemType', - callback: function (_data) { - callback(_data.text); - } - }); - }}, - { label: "退费金额", name: "Amount", width: 100, align: "left"}, - { label: "退费方式", name: "RType", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'RefundStatus', - callback: function (_data) { - callback(_data.text); - } - }); - }}, + { label: "学号", name: "StuNo", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "专业", name: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { label: "缴费年度", name: "FSYear", width: 100, align: "left" }, + { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left" }, + { label: "收费项目名称", name: "ChargeItemName", width: 100, align: "left" }, + { + label: "收费项目类型", name: "ChargeItemType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'ChargeItemType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "退费金额", name: "Amount", width: 100, align: "left" }, + { label: "退费时间", name: "F_CreateDate", width: 150, align: "left" }, + { + label: "退费方式", name: "RType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'RType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, ], - mainId:'Id', + mainId: 'Id', isPage: true }); page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundEntity.cs index b6ee1fabf..72eaa8e3f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundEntity.cs @@ -69,6 +69,17 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement /// [Column("F_CREATEUSERNAME")] public string F_CreateUserName { get; set; } + + [NotMapped] + public string StuNo { get; set; } + [NotMapped] + public string StuName { get; set; } + [NotMapped] + public string MajorNo { get; set; } + [NotMapped] + public string ClassNo { get; set; } + [NotMapped] + public string FSYear { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundService.cs index 80411cd5f..caabd62ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundService.cs @@ -30,16 +30,9 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement try { var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.Id, - t.ChargeItemCode, - t.ChargeItemName, - t.ChargeItemType, - t.Amount, - t.RType - "); - strSql.Append(" FROM FinaChargeRefund t "); + strSql.Append("SELECT t.*,d.StuNo,d.StuName,d.MajorNo,d.ClassNo,b.FSYear "); + strSql.Append(" FROM FinaChargeRefund t left join FinaChargeStuYearItem b on t.FSYIId=b.FSYIId left join FinaChargeStuYear c on b.FSYId=c.FSYId "); + strSql.Append(" left join FinaChargeStudent d on c.StuNo=d.StuNo "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -54,6 +47,16 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement dp.Add("ChargeItemName", "%" + queryParam["ChargeItemName"].ToString() + "%", DbType.String); strSql.Append(" AND t.ChargeItemName Like @ChargeItemName "); } + if (!queryParam["StuNo"].IsEmpty()) + { + dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String); + strSql.Append(" AND d.StuNo Like @StuNo "); + } + if (!queryParam["StuName"].IsEmpty()) + { + dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String); + strSql.Append(" AND d.StuName Like @StuName "); + } if (!queryParam["RType"].IsEmpty()) { dp.Add("RType", queryParam["RType"].ToString(), DbType.String);