From 7c772ef62d53274bba8a8c244d7ae5fb6d899e9e Mon Sep 17 00:00:00 2001 From: fzp <645608524@qq.com> Date: Sun, 20 Aug 2023 16:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FinaChargeLogController.cs | 117 +++++++++++ .../FinaChargeStuYearController.cs | 40 +++- .../Views/FinaChargeLog/Form.cshtml | 35 ++++ .../Views/FinaChargeLog/Form.js | 36 ++++ .../Views/FinaChargeLog/Index.cshtml | 37 ++++ .../Views/FinaChargeLog/Index.js | 94 +++++++++ .../Views/FinaChargeRefund/Index.cshtml | 3 - .../Views/FinaChargeRefund/Index.js | 43 +--- .../Views/FinaChargeStuOrder/Index.cshtml | 2 +- .../FinaChargeStuYear/IndexForStudent.cshtml | 2 +- .../FinaChargeStuYear/IndexForStudent.js | 12 +- .../Views/FinaChargeStuYearItem/Index.cshtml | 2 +- .../Learun.Application.Web.csproj | 5 + .../FinaChargeStuYearApi.cs | 32 ++- .../FinaChargeLogMap.cs | 10 +- .../FinaChargeLog/FinaChargeLogBLL.cs | 37 +--- .../FinaChargeLog/FinaChargeLogEntity.cs | 30 +-- .../FinaChargeLog/FinaChargeLogIBLL.cs | 17 +- .../FinaChargeLog/FinaChargeLogService.cs | 192 +++++++----------- .../PayFee/payInvioce.vue | 2 +- 20 files changed, 489 insertions(+), 259 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeLogController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Index.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeLogController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeLogController.cs new file mode 100644 index 000000000..884517565 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeLogController.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2023-08-20 16:06 + /// 描 述：收费系统操作日志 + /// + public class FinaChargeLogController : MvcControllerBase + { + private FinaChargeLogIBLL finaChargeLogIBLL = new FinaChargeLogBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = finaChargeLogIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var FinaChargeLogData = finaChargeLogIBLL.GetFinaChargeLogEntity( keyValue ); + var jsonData = new { + FinaChargeLog = FinaChargeLogData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + finaChargeLogIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + FinaChargeLogEntity entity = strEntity.ToObject(); + finaChargeLogIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs index 00abc770b..4fd3c6c8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs @@ -28,6 +28,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers { private FinaChargeStuYearIBLL finaChargeStuYearIBLL = new FinaChargeStuYearBLL(); private FinaChargeStuOrderIBLL finaChargeStuOrderIbll = new FinaChargeStuOrderBLL(); + private EADateArrangeIBLL eaDateArrangeIbll = new EADateArrangeBLL(); #region 视图功能 @@ -38,19 +39,20 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } [HttpGet] public ActionResult IndexForTeacher() { - return View(); + return View(); } [HttpGet] public ActionResult IndexForStudent() { - return View(); + return View(""); } + /// /// 表单页 /// @@ -58,30 +60,47 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } [HttpGet] public ActionResult InvoiceForm() { - return View(); + return View(); } [HttpGet] public ActionResult PayFeeForm() { - return View(); + return View(); } [HttpGet] public ActionResult GenerateByConditionForm() { - return View(); + return View(); } #endregion #region 获取数据 + [HttpGet] + [AjaxOnly] + public ActionResult IfCanPay() + { + var nowyearsemester = Common.GetSemesterAndYear(); + var eastatus = eaDateArrangeIbll.GetEADateArrangeEntity("17"); + if (eastatus != null && eastatus.CheckMark == "1" && + eastatus.AcademicYearNo == nowyearsemester.AcademicYearShort + && eastatus.Semester == nowyearsemester.Semester && eastatus.MakeDate < DateTime.Now && + eastatus.EndDate > DateTime.Now) + { + return Success(new { success = "1" }); + } + else + return Success(new { success = "0",info= "当前不在缴费时间范围" }); + } + [HttpGet] [AjaxOnly] public ActionResult GetYearTree() @@ -119,8 +138,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var FinaChargeStuYearData = finaChargeStuYearIBLL.GetFinaChargeStuYearEntity( keyValue ); - var jsonData = new { + var FinaChargeStuYearData = finaChargeStuYearIBLL.GetFinaChargeStuYearEntity(keyValue); + var jsonData = new + { FinaChargeStuYear = FinaChargeStuYearData, }; return Success(jsonData); @@ -183,7 +203,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { FinaChargeStuYearEntity entity = strEntity.ToObject(); - finaChargeStuYearIBLL.SaveEntity(keyValue,entity); + finaChargeStuYearIBLL.SaveEntity(keyValue, entity); if (string.IsNullOrEmpty(keyValue)) { } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Form.cshtml new file mode 100644 index 000000000..7f0430f12 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Form.cshtml @@ -0,0 +1,35 @@ +@{ + ViewBag.Title = "收费系统操作日志"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
功能模块
+ +
+
+
操作类型
+ +
+
+
操作时间
+ +
+
+
操作用户
+ +
+
+
用户IP
+ +
+
+
操作内容
+ +
+
+
操作数据Id
+ +
+
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Form.js new file mode 100644 index 000000000..43c3d6caf --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Form.js @@ -0,0 +1,36 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-08-20 16:06 + * 描 述：收费系统操作日志 + */ +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 () { + $('#F_OperateType').lrDataItemSelect({ code: '' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeLog/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Index.cshtml new file mode 100644 index 000000000..97d8b9387 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Index.cshtml @@ -0,0 +1,37 @@ +@{ + ViewBag.Title = "收费系统操作日志"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
+
+
+
操作用户
+ +
+
+
+
+
+
+
+ +
+
+  查看详细 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Index.js new file mode 100644 index 000000000..3c74dbb81 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeLog/Index.js @@ -0,0 +1,94 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-08-20 16:06 + * 描 述：收费系统操作日志 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var startTime; + var endTime; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 时间搜索框 + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('F_LogId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formview', + title: '查看详细', + url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeLog/Form?keyValue=' + keyValue, + width: 700, + height: 600, + btn:null + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeLog/GetPageList', + headData: [ + { label: "功能模块", name: "F_Module", width: 120, align: "left"}, + { label: "操作类型", name: "F_OperateType", width: 100, align: "left"}, + { label: "操作时间", name: "F_OperateTime", width: 180, align: "left"}, + { label: "操作用户", name: "F_OperateAccount", width: 150, align: "left"}, + { label: "用户IP", name: "F_IPAddress", width: 100, align: "left"}, + { label: "操作内容", name: "F_SourceContentJson", width: 200, align: "left"}, + { label: "操作数据Id", name: "F_SourceObjectId", width: 100, align: "left"}, + ], + mainId:'F_LogId', + isPage: true + }); + }, + search: function (param) { + param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; + $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} 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 1205fe05a..1865e1dfe 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 @@ -39,9 +39,6 @@
-  新增 -  编辑 -  删除
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 06b371226..2349b8adc 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 @@ -21,48 +21,7 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); - // 新增 - $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/Form', - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/Form?keyValue=' + keyValue, - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); + }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.cshtml index 1de07638c..982de67fe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.cshtml @@ -46,7 +46,7 @@
-   导入 +   导入线下缴费记录   查看明细
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.cshtml index 44fbcd9ee..ade5d56f5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.cshtml @@ -20,7 +20,7 @@
 二维码缴费 -  缴费记录 + @* 缴费记录*@  查看发票
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.js index 903128801..4e52b0255 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.js @@ -11,9 +11,15 @@ var bootstrap = function ($, learun) { var page = { init: function () { page.bind(); - setTimeout(function () { - page.initGird(); - }, 500);//延迟 + learun.httpAsync("get", "/ReceiveSendFeeManagement/FinaChargeStuYear/IfCanPay", {}, function (data) { + if (data.success == "0") { + learun.alert.error(data.info); + } else { + setTimeout(function () { + page.initGird(); + }, 500);//延迟 + } + }); }, bind: function () { $('#FSYear').lrselect({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.cshtml index aecfad550..8ee9cc8a0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.cshtml @@ -55,7 +55,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 51a81ebc9..a3a0c94e9 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 @@ -893,6 +893,7 @@ + @@ -6679,6 +6680,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs index be2951fa7..d3a064874 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs @@ -31,6 +31,7 @@ namespace Learun.Application.WebApi.Modules { private FinaChargeStuYearIBLL finaChargeStuYearIBLL = new FinaChargeStuYearBLL(); private FinaChargeStuOrderIBLL finaChargeStuOrderIbll = new FinaChargeStuOrderBLL(); + private EADateArrangeIBLL eaDateArrangeIbll = new EADateArrangeBLL(); public FinaChargeStuYearApi() : base("/ReceiveSendFeeManagement/FinaChargeStuYearApi") @@ -50,16 +51,29 @@ namespace Learun.Application.WebApi.Modules public Response GetPayfeeList(dynamic _) { - ReqPageParam parameter = this.GetReqData(); - var data = finaChargeStuYearIBLL.GetPageList(parameter.pagination, parameter.queryJson); - var jsonData = new + var nowyearsemester = Common.GetSemesterAndYear(); + var eastatus = eaDateArrangeIbll.GetEADateArrangeEntity("17"); + if (eastatus != null && eastatus.CheckMark == "1" && + eastatus.AcademicYearNo == nowyearsemester.AcademicYearShort + && eastatus.Semester == nowyearsemester.Semester && eastatus.MakeDate < DateTime.Now && + eastatus.EndDate > DateTime.Now) { - rows = data, - total = parameter.pagination.total, - page = parameter.pagination.page, - records = parameter.pagination.records - }; - return Success(jsonData); + ReqPageParam parameter = this.GetReqData(); + var data = finaChargeStuYearIBLL.GetPageList(parameter.pagination, parameter.queryJson); + var jsonData = new + { + rows = data, + total = parameter.pagination.total, + page = parameter.pagination.page, + records = parameter.pagination.records + }; + return Success(jsonData); + } + else + { + return Fail("当前不在缴费时间范围"); + } + } public Response GetPayfeeInfo(dynamic _) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/FinaChargeLogMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/FinaChargeLogMap.cs index cc90c9907..7fe17a719 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/FinaChargeLogMap.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/FinaChargeLogMap.cs @@ -1,5 +1,5 @@ -using System.Data.Entity.ModelConfiguration; -using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement; +using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement; +using System.Data.Entity.ModelConfiguration; namespace Learun.Application.Mapping { @@ -7,8 +7,8 @@ namespace Learun.Application.Mapping /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2023-07-31 22:20 - /// 描 述：操作日志 + /// 日 期：2023-08-20 16:06 + /// 描 述：收费系统操作日志 ///
public class FinaChargeLogMap : EntityTypeConfiguration { @@ -16,7 +16,7 @@ namespace Learun.Application.Mapping { #region 表、主键 //表 - this.ToTable("FinaChargeLog"); + this.ToTable("FINACHARGELOG"); //主键 this.HasKey(t => t.F_LogId); #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLL.cs index 196a25c0c..bcef1735f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLL.cs @@ -9,8 +9,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2023-07-31 22:20 - /// 描 述：操作日志 + /// 日 期：2023-08-20 16:06 + /// 描 述：收费系统操作日志 /// public class FinaChargeLogBLL : FinaChargeLogIBLL { @@ -19,31 +19,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement #region 获取数据 /// - /// 获取列表数据 - /// - /// 查询参数 - /// - public IEnumerable GetList( string queryJson ) - { - try - { - return finaChargeLogService.GetList(queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取列表分页数据 + /// 获取页面显示列表数据 /// /// 分页参数 /// 查询参数 @@ -68,15 +44,15 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement } /// - /// 获取实体数据 + /// 获取FinaChargeLog表实体数据 /// /// 主键 /// - public FinaChargeLogEntity GetEntity(string keyValue) + public FinaChargeLogEntity GetFinaChargeLogEntity(string keyValue) { try { - return finaChargeLogService.GetEntity(keyValue); + return finaChargeLogService.GetFinaChargeLogEntity(keyValue); } catch (Exception ex) { @@ -123,6 +99,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement /// /// 主键 /// 实体 + /// public void SaveEntity(string keyValue, FinaChargeLogEntity entity) { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogEntity.cs index b7545f213..80d890c27 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogEntity.cs @@ -1,137 +1,117 @@ using Learun.Util; using System; using System.ComponentModel.DataAnnotations.Schema; -namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement { /// /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2023-07-31 22:20 - /// 描 述：操作日志 + /// 日 期：2023-08-20 16:06 + /// 描 述：收费系统操作日志 /// - public class FinaChargeLogEntity + public class FinaChargeLogEntity { #region 实体成员 /// /// 日志主键 /// - /// [Column("F_LOGID")] public string F_LogId { get; set; } /// /// 分类Id 1-登陆2-访问3-操作4-异常 /// - /// [Column("F_CATEGORYID")] public int? F_CategoryId { get; set; } /// /// 来源对象主键 /// - /// [Column("F_SOURCEOBJECTID")] public string F_SourceObjectId { get; set; } /// /// 来源日志内容 /// - /// [Column("F_SOURCECONTENTJSON")] public string F_SourceContentJson { get; set; } /// /// 操作时间 /// - /// [Column("F_OPERATETIME")] public DateTime? F_OperateTime { get; set; } /// /// 操作用户Id /// - /// [Column("F_OPERATEUSERID")] public string F_OperateUserId { get; set; } /// /// 操作用户 /// - /// [Column("F_OPERATEACCOUNT")] public string F_OperateAccount { get; set; } /// /// 操作类型Id /// - /// [Column("F_OPERATETYPEID")] public string F_OperateTypeId { get; set; } /// /// 操作类型 /// - /// [Column("F_OPERATETYPE")] public string F_OperateType { get; set; } /// /// 系统功能 /// - /// [Column("F_MODULE")] public string F_Module { get; set; } /// /// IP地址 /// - /// [Column("F_IPADDRESS")] public string F_IPAddress { get; set; } /// /// IP地址所在城市 /// - /// [Column("F_IPADDRESSNAME")] public string F_IPAddressName { get; set; } /// /// 主机 /// - /// [Column("F_HOST")] public string F_Host { get; set; } /// /// 浏览器 /// - /// [Column("F_BROWSER")] public string F_Browser { get; set; } /// /// 执行结果状态 /// - /// [Column("F_EXECUTERESULT")] public int? F_ExecuteResult { get; set; } /// /// 执行结果信息 /// - /// [Column("F_EXECUTERESULTJSON")] public string F_ExecuteResultJson { get; set; } /// /// 备注 /// - /// [Column("F_DESCRIPTION")] public string F_Description { get; set; } /// /// 删除标记 /// - /// [Column("F_DELETEMARK")] public int? F_DeleteMark { get; set; } /// /// 有效标志 /// - /// [Column("F_ENABLEDMARK")] public int? F_EnabledMark { get; set; } /// /// 来源 /// - /// [Column("F_SOURCE")] public string F_Source { get; set; } #endregion @@ -153,6 +133,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement this.F_LogId = keyValue; } #endregion + #region 扩展字段 + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogIBLL.cs index 3c229666b..6e8fa5404 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogIBLL.cs @@ -8,32 +8,25 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2023-07-31 22:20 - /// 描 述：操作日志 + /// 日 期：2023-08-20 16:06 + /// 描 述：收费系统操作日志 /// public interface FinaChargeLogIBLL { #region 获取数据 /// - /// 获取列表数据 + /// 获取页面显示列表数据 /// /// 查询参数 /// - IEnumerable GetList( string queryJson ); - /// - /// 获取列表分页数据 - /// - /// 分页参数 - /// 查询参数 - /// IEnumerable GetPageList(Pagination pagination, string queryJson); /// - /// 获取实体数据 + /// 获取FinaChargeLog表实体数据 /// /// 主键 /// - FinaChargeLogEntity GetEntity(string keyValue); + FinaChargeLogEntity GetFinaChargeLogEntity(string keyValue); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogService.cs index ab6af84ae..f3f8118e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogService.cs @@ -1,10 +1,9 @@ using Dapper; -using Learun.Application.Base.SystemModule; using Learun.DataBase.Repository; using Learun.Util; using System; using System.Collections.Generic; -using System.Linq; +using System.Data; using System.Text; namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement @@ -13,65 +12,76 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2023-07-31 22:20 - /// 描 述：操作日志 + /// 日 期：2023-08-20 16:06 + /// 描 述：收费系统操作日志 /// public class FinaChargeLogService : RepositoryFactory { - #region 构造函数和属性 + #region 获取数据 - private string fieldSql; /// - /// 构造方法 + /// 获取页面显示列表数据 /// - public FinaChargeLogService() + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) { - fieldSql=@" + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" t.F_LogId, - t.F_CategoryId, - t.F_SourceObjectId, - t.F_SourceContentJson, + t.F_Module, + t.F_OperateType, t.F_OperateTime, - t.F_OperateUserId, t.F_OperateAccount, - t.F_OperateTypeId, - t.F_OperateType, - t.F_Module, t.F_IPAddress, - t.F_IPAddressName, - t.F_Host, - t.F_Browser, - t.F_ExecuteResult, - t.F_ExecuteResultJson, - t.F_Description, - t.F_DeleteMark, - t.F_EnabledMark, - t.F_Source - "; + t.F_SourceContentJson, + t.F_SourceObjectId + "); + strSql.Append(" FROM FinaChargeLog t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.F_OperateTime >= @startTime AND t.F_OperateTime <= @endTime ) "); + } + if (!queryParam["F_OperateAccount"].IsEmpty()) + { + dp.Add("F_OperateAccount", "%" + queryParam["F_OperateAccount"].ToString() + "%", DbType.String); + strSql.Append(" AND t.F_OperateAccount Like @F_OperateAccount "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } } - #endregion - - #region 获取数据 /// - /// 获取列表数据 + /// 获取FinaChargeLog表实体数据 /// - /// 条件参数 + /// 主键 /// - public IEnumerable GetList( string queryJson ) + public FinaChargeLogEntity GetFinaChargeLogEntity(string keyValue) { try { - //参考写法 - //var queryParam = queryJson.ToJObject(); - // 虚拟参数 - //var dp = new DynamicParameters(new { }); - //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(fieldSql); - strSql.Append(" FROM FinaChargeLog t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); } catch (Exception ex) { @@ -86,21 +96,19 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement } } + #endregion + + #region 提交数据 + /// - /// 获取列表分页数据 + /// 删除实体数据 /// - /// 分页参数 - /// 条件参数 - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) + /// 主键 + public void DeleteEntity(string keyValue) { try { - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(fieldSql); - strSql.Append(" FROM SP_Log t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + this.BaseRepository("CollegeMIS").Delete(t=>t.F_LogId == keyValue); } catch (Exception ex) { @@ -116,15 +124,24 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement } /// - /// 获取实体数据 + /// 保存实体数据（新增、修改） /// /// 主键 - /// - public FinaChargeLogEntity GetEntity(string keyValue) + /// 实体 + public void SaveEntity(string keyValue, FinaChargeLogEntity entity) { try { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } } catch (Exception ex) { @@ -139,16 +156,13 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement } } - #endregion - - #region 提交数据 - /// /// 清空日志 /// /// 日志分类Id /// 保留时间段内 - public void RemoveLog(int categoryId, string keepTime) { + public void RemoveLog(int categoryId, string keepTime) + { try { DateTime operateTime = DateTime.Now; @@ -212,62 +226,6 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement } - /// - /// 删除实体数据 - /// - /// 主键 - public void DeleteEntity(string keyValue) - { - try - { - this.BaseRepository("CollegeMIS").Delete(t=>t.F_LogId == keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// 实体 - /// - public void SaveEntity(string keyValue, FinaChargeLogEntity entity) - { - try - { - if (!string.IsNullOrEmpty(keyValue)) - { - entity.Modify(keyValue); - this.BaseRepository("CollegeMIS").Update(entity); - } - else - { - entity.Create(); - this.BaseRepository("CollegeMIS").Insert(entity); - } - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - #endregion } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/payInvioce.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/payInvioce.vue index 72fb2501f..564f0d833 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/payInvioce.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/payInvioce.vue @@ -36,7 +36,7 @@ }, init(){ this.LOADING() - this.HTTP_GET("/learun/payfee/getinvoice?keyValue="+this.keyValue).then((success)=>{ + this.HTTP_GET("/ReceiveSendFeeManagement/FinaChargeStuYearApi/getinvoice?keyValue="+this.keyValue).then((success)=>{ this.HIDE_LOADING() if(!success)return if(!success.length){