From 0e4abe5e14a03888b9cc69fcc1f931c95f4a541f Mon Sep 17 00:00:00 2001 From: fzp <645608524@qq.com> Date: Thu, 17 Aug 2023 18:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rHelper.cs => FinaChargeOperatorHelper.cs} | 32 +-- .../App_Start/01 Handler/MvcControllerBase.cs | 7 +- .../Controllers/FinaChargeItemController.cs | 17 +- .../FinaChargesStandardController.cs | 14 +- .../Views/FinaChargeItem/Index.js | 8 +- .../Views/FinaChargesStandard/Index.js | 5 + .../Controllers/SP_FeeItemController.cs | 146 ----------- .../Controllers/SP_FeeItem_FlowController.cs | 135 ---------- .../Controllers/SP_LogController.cs | 133 ---------- .../StuPayManageAreaRegistration.cs | 28 --- .../StuPayManage/Views/SP_FeeItem/Form.cshtml | 39 --- .../StuPayManage/Views/SP_FeeItem/Form.js | 62 ----- .../Views/SP_FeeItem/Index.cshtml | 61 ----- .../StuPayManage/Views/SP_FeeItem/Index.js | 157 ------------ .../StuPayManage/Views/SP_Log/Form.cshtml | 18 -- .../Areas/StuPayManage/Views/SP_Log/Form.js | 33 --- .../StuPayManage/Views/SP_Log/Index.cshtml | 59 ----- .../Areas/StuPayManage/Views/SP_Log/Index.js | 149 ------------ .../Areas/StuPayManage/Views/web.config | 35 --- .../Learun.Application.Web.csproj | 14 +- .../Learun.Application.Mapping.csproj | 3 +- .../FinaChargeLogMap.cs} | 11 +- .../StuPayManage/SP_FeeItemMap.cs | 29 --- .../Learun.Application.TwoDevelopment.csproj | 14 +- .../FinaChargeLog/FinaChargeLogBLL.cs} | 25 +- .../FinaChargeLog/FinaChargeLogBLLStatic.cs} | 12 +- .../FinaChargeLog/FinaChargeLogEntity.cs} | 4 +- .../FinaChargeLog/FinaChargeLogIBLL.cs} | 12 +- .../FinaChargeLog/FinaChargeLogService.cs} | 28 +-- .../StuPayManage/SP_FeeItem/SP_FeeItemBLL.cs | 163 ------------- .../SP_FeeItem/SP_FeeItemEntity.cs | 138 ----------- .../StuPayManage/SP_FeeItem/SP_FeeItemIBLL.cs | 62 ----- .../SP_FeeItem/SP_FeeItemService.cs | 230 ------------------ .../Learun.Util.Operat/OperationType.cs | 6 + 34 files changed, 94 insertions(+), 1795 deletions(-) rename Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/{SP_OperatorHelper.cs => FinaChargeOperatorHelper.cs} (61%) delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_FeeItemController.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_FeeItem_FlowController.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_LogController.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/StuPayManageAreaRegistration.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Form.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Form.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Index.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Index.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Form.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Form.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Index.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Index.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/web.config rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/{StuPayManage/SP_LogMap.cs => ReceiveSendFeeManagement/FinaChargeLogMap.cs} (66%) delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/StuPayManage/SP_FeeItemMap.cs rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/{StuPayManage/SP_Log/SP_LogBLL.cs => ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLL.cs} (78%) rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/{StuPayManage/SP_Log/SP_LogBLLStatic.cs => ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLLStatic.cs} (71%) rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/{StuPayManage/SP_Log/SP_LogEntity.cs => ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogEntity.cs} (97%) rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/{StuPayManage/SP_Log/SP_LogIBLL.cs => ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogIBLL.cs} (77%) rename Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/{StuPayManage/SP_Log/SP_LogService.cs => ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogService.cs} (88%) delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemEntity.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemIBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/SP_OperatorHelper.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/FinaChargeOperatorHelper.cs similarity index 61% rename from Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/SP_OperatorHelper.cs rename to Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/FinaChargeOperatorHelper.cs index 06683bc4c..eb88ec08a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/SP_OperatorHelper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/FinaChargeOperatorHelper.cs @@ -5,17 +5,17 @@ using System.Collections.Generic; using System.Linq; using System.Web; using Learun.Application.TwoDevelopment; -using Learun.Application.TwoDevelopment.StuPayManage; +using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement; -namespace Learun.Application.Web.App_Start._01_Handler +namespace Learun.Application.Web { - public class SP_OperatorHelper + public class FinaChargeOperatorHelper { - private static SP_LogService sP_LogService = new SP_LogService(); - public static SP_OperatorHelper Instance + private static FinaChargeLogService finaChargeLogService = new FinaChargeLogService(); + public static FinaChargeOperatorHelper Instance { - get { return new SP_OperatorHelper(); } + get { return new FinaChargeOperatorHelper(); } } public void WriteOperateLog(OperateLogModel operateLogModel) { @@ -25,7 +25,7 @@ namespace Learun.Application.Web.App_Start._01_Handler { operateLogModel.userInfo = LoginUserInfo.Get(); } - SP_LogEntity logEntity = new SP_LogEntity(); + FinaChargeLogEntity logEntity = new FinaChargeLogEntity(); logEntity.F_CategoryId = 3; logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString(); logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type); @@ -37,23 +37,7 @@ namespace Learun.Application.Web.App_Start._01_Handler logEntity.F_SourceObjectId = operateLogModel.sourceObjectId; logEntity.F_SourceContentJson = operateLogModel.sourceContentJson; logEntity.F_Description = "PC端"; - //logEntity.WriteLog(); - - try - { - sP_LogService.WriteLog(logEntity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } + finaChargeLogService.WriteLog(logEntity); } catch (Exception) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/MvcControllerBase.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/MvcControllerBase.cs index 0ef234cc5..4d87b935e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/MvcControllerBase.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/App_Start/01 Handler/MvcControllerBase.cs @@ -1,5 +1,4 @@ -using Learun.Application.Web.App_Start._01_Handler; -using Learun.Loger; +using Learun.Loger; using Learun.Util; using Learun.Util.Operat; using System.Web.Mvc; @@ -108,7 +107,7 @@ namespace Learun.Application.Web /// /// /// - protected virtual ActionResult Success_SP(string info, string title, OperationType type, string keyValue, string content) + protected virtual ActionResult Success_FinaCharge(string info, string title, OperationType type, string keyValue, string content) { OperateLogModel operateLogModel = new OperateLogModel(); operateLogModel.title = title; @@ -117,7 +116,7 @@ namespace Learun.Application.Web operateLogModel.sourceObjectId = keyValue; operateLogModel.sourceContentJson = content; - SP_OperatorHelper.Instance.WriteOperateLog(operateLogModel); + FinaChargeOperatorHelper.Instance.WriteOperateLog(operateLogModel); return Content(new ResParameter { code = ResponseCode.success, info = info, data = new object { } }.ToJson()); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeItemController.cs index 7565bfaf7..95d85d0c0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeItemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeItemController.cs @@ -5,6 +5,8 @@ using System.Web.Mvc; using System.Collections.Generic; using System; using System.Linq; +using Learun.Loger; +using Learun.Util.Operat; namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers { @@ -124,14 +126,14 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers public ActionResult Lock(string keyValue) { finaChargeItemIBLL.Lock(keyValue); - return Success("启用成功！"); + return Success_FinaCharge("操作成功！", "收费项目设置", OperationType.Lock, keyValue, "启用收费项目"); } [HttpPost] [AjaxOnly] public ActionResult UnLock(string keyValue) { finaChargeItemIBLL.UnLock(keyValue); - return Success("停用成功！"); + return Success_FinaCharge("操作成功！", "收费项目设置", OperationType.UnLock, keyValue, "停用收费项目"); } /// /// 删除实体数据 @@ -149,7 +151,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers } finaChargeItemIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); + return Success_FinaCharge("删除成功！", "收费项目设置", OperationType.Delete, keyValue, "删除收费项目"); } /// /// 保存实体数据（新增、修改） @@ -180,7 +182,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers } } - var modelcode= finaChargeItemIBLL.GetFinaChargeItemEntityByChargeItemCode(entity.ChargeItemCode); + var modelcode = finaChargeItemIBLL.GetFinaChargeItemEntityByChargeItemCode(entity.ChargeItemCode); if (modelcode != null) { if (string.IsNullOrEmpty(keyValue)) @@ -200,7 +202,12 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers entity.CreateUserId = loginUserInfo.userId; entity.CreateUserName = loginUserInfo.realName; finaChargeItemIBLL.SaveEntity(keyValue, entity); - return Success("保存成功！"); + if (string.IsNullOrEmpty(keyValue)) + { + return Success_FinaCharge("保存成功！", "收费项目设置", OperationType.Create, entity.ChargeItemID,entity.ToJson()); + } + else + return Success_FinaCharge("保存成功！", "收费项目设置", OperationType.Update, entity.ChargeItemID, entity.ToJson()); } #endregion 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 545a007d5..17704968c 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 @@ -6,6 +6,7 @@ using System.Collections.Generic; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Linq; using System; +using Learun.Util.Operat; using static Learun.Util.WebHelper; using Newtonsoft.Json; @@ -228,22 +229,15 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers [AjaxOnly] public ActionResult DeleteForm(string keyValue) { - //判断某专业收费标准是否已使用 - //var isCharge = finaChargesStandardIBLL.IsChargeByMajorNo(entity.DeptNo,entity.MajorNo, entity.SYear.ToString(), entity.Grade); - //if (isCharge) - //{ - // return Fail("该信息正在被系统使用，不能删除！"); - //} - finaChargesStandardIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); + return Success_FinaCharge("删除成功！", "收费标准设置", OperationType.Delete, keyValue, "删除收费标准"); } [HttpPost] [AjaxOnly] public ActionResult Lock(string deptno, string majorNo, string syear, string grade,string ChargeStandardID) { finaChargesStandardIBLL.Lock(deptno, majorNo, syear, grade, ChargeStandardID); - return Success("审核成功！"); + return Success_FinaCharge("审核成功！", "收费标准设置", OperationType.Lock, ChargeStandardID,"专业"+majorNo+"年度"+syear+"年级"+grade); } [HttpPost] @@ -251,7 +245,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers public ActionResult UnLock(string deptno, string majorNo, string syear, string grade, string ChargeStandardID) { finaChargesStandardIBLL.UnLock(deptno, majorNo, syear, grade, ChargeStandardID); - return Success("去审成功！"); + return Success_FinaCharge("去审成功！", "收费标准设置", OperationType.UnLock, ChargeStandardID, "专业" + majorNo + "年度" + syear + "年级" + grade); } /// /// 保存实体数据（新增、修改） diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeItem/Index.js index 213069663..87fa5fc70 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeItem/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeItem/Index.js @@ -37,10 +37,10 @@ var bootstrap = function ($, learun) { $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ChargeItemID'); if (learun.checkrow(keyValue)) { - var keyWordMark = $('#gridtable').jfGridValue('KeyWordMark'); - if (keyWordMark == "1") { - learun.alert.warning("系统保留项目，不允许修改！"); - return false; + var CheckMark = $('#gridtable').jfGridValue('CheckMark'); + if (CheckMark.indexOf('true') != -1) { + learun.alert.warning("编辑失败，选中记录中包含已启用项目！"); + return; } learun.layerForm({ id: 'form', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargesStandard/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargesStandard/Index.js index 7b0b38510..d2981112b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargesStandard/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargesStandard/Index.js @@ -103,11 +103,16 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('TempId'); selectedRow = $('#gridtable').jfGridGet('rowdata'); + console.log(selectedRow); if (learun.checkrow(keyValue)) { if (selectedRow.ChargeStandardID == 0) {//专业下收费标准 learun.alert.warning("请选择具体的收费项目！"); return false; } + if (selectedRow.CheckMark==true) { + learun.alert.warning("删除失败，选中记录中包含已审核项目！"); + return; + } learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargesStandard/DeleteForm', { keyValue: selectedRow.ChargeStandardID }, function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_FeeItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_FeeItemController.cs deleted file mode 100644 index fa4ab32db..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_FeeItemController.cs +++ /dev/null @@ -1,146 +0,0 @@ -using Learun.Util; -using System.Data; -using Learun.Application.TwoDevelopment.StuPayManage; -using System.Web.Mvc; -using System.Collections.Generic; -using Learun.Util.Operat; -using Learun.Application.TwoDevelopment.EducationalAdministration; -using System.Text.Json.Nodes; -using Newtonsoft.Json; -using System.Linq; - -namespace Learun.Application.Web.Areas.StuPayManage.Controllers -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2023-07-29 18:34 - /// 描 述：专业收费项目设置 - /// - public class SP_FeeItemController : MvcControllerBase - { - private SP_FeeItemIBLL sP_FeeItemIBLL = new SP_FeeItemBLL(); - - #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 = sP_FeeItemIBLL.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 SP_FeeItemData = sP_FeeItemIBLL.GetSP_FeeItemEntity(keyValue); - var jsonData = new { - SP_FeeItem = SP_FeeItemData, - }; - return Success(jsonData); - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - SP_FeeItemEntity entity = sP_FeeItemIBLL.GetSP_FeeItemEntity(keyValue); - if (entity == null) throw new System.Exception("主键无效"); - sP_FeeItemIBLL.DeleteEntity(keyValue); - //return Success("删除成功！"); - return Success_SP("删除成功！", "收费项目", OperationType.Delete, entity.F_Id, entity.ToJson()); - - } - - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForms(string keyValue) { - - var jsonObj = new { - ids = string.Join(",", keyValue.Split(',').Select(x => $"'{x}'")) - }; - - string queryJson = JsonConvert.SerializeObject(jsonObj); - IEnumerable entitys = sP_FeeItemIBLL.GetList(queryJson); - if (entitys == null || entitys.Count()==0) throw new System.Exception("查无数据"); - sP_FeeItemIBLL.DeleteEntity(entitys); - //return Success("删除成功！"); - return Success_SP("删除成功！", "收费项目", OperationType.Delete, null, entitys.ToJson()); - - } - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue, string strEntity) - { - SP_FeeItemEntity entity = strEntity.ToObject(); - sP_FeeItemIBLL.SaveEntity(keyValue,entity); - if (string.IsNullOrEmpty(keyValue)) - { - } - //return Success("保存成功！"); - return Success_SP("保存成功！", "收费项目", string.IsNullOrEmpty(keyValue) ? OperationType.Create : OperationType.Update, entity.F_Id, entity.ToJson()); - - } - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_FeeItem_FlowController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_FeeItem_FlowController.cs deleted file mode 100644 index caf0f1243..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_FeeItem_FlowController.cs +++ /dev/null @@ -1,135 +0,0 @@ -using Learun.Util; -using System.Data; -using Learun.Application.TwoDevelopment.StuPayManage; -using System.Web.Mvc; -using Learun.Application.TwoDevelopment.LR_CodeDemo; -using System.Collections.Generic; -using Learun.Application.Base.SystemModule; - -namespace Learun.Application.Web.Areas.StuPayManage.Controllers -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2023-07-29 21:26 - /// 描 述：专业收费项目设置 - /// - public class SP_FeeItem_FlowController : MvcControllerBase - { - private SP_FeeItem_FlowIBLL sP_FeeItem_FlowIBLL = new SP_FeeItem_FlowBLL(); - private CodeRuleIBLL codeRuleIBLL = new CodeRuleBLL(); - - #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 = sP_FeeItem_FlowIBLL.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 SP_FeeItemData = sP_FeeItem_FlowIBLL.GetSP_FeeItemEntity( keyValue ); - var jsonData = new { - SP_FeeItem = SP_FeeItemData, - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// - /// 流程实例主键 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetFormDataByProcessId(string processId) - { - var SP_FeeItemData = sP_FeeItem_FlowIBLL.GetEntityByProcessId( processId ); - var jsonData = new { - SP_FeeItem = SP_FeeItemData, - }; - return Success(jsonData); - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - sP_FeeItem_FlowIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue, string strEntity) - { - SP_FeeItemEntity entity = strEntity.ToObject(); - sP_FeeItem_FlowIBLL.SaveEntity(keyValue,entity); - if (string.IsNullOrEmpty(keyValue)) - { - } - return Success("保存成功！"); - } - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_LogController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_LogController.cs deleted file mode 100644 index 15ccaa29e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Controllers/SP_LogController.cs +++ /dev/null @@ -1,133 +0,0 @@ -using Learun.Application.TwoDevelopment; -using Learun.Application.TwoDevelopment.StuPayManage; -using Learun.Application.TwoDevelopment.StuPayManage.SP_Log; -using Learun.Util; -using System.Data; -using System.Web.Mvc; - -namespace Learun.Application.Web.Areas.StuPayManage.Controllers -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2023-07-31 22:20 - /// 描 述：操作日志 - /// - public class SP_LogController : MvcControllerBase - { - private SP_LogIBLL sP_LogIBLL = new SP_LogBLL(); - - #region 视图功能 - - /// - /// 主页面 - /// - /// - [HttpGet] - public ActionResult Index() - { - return View(); - } - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult Form() - { - return View(); - } - #endregion - - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// 查询参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetList( string queryJson ) - { - var data = sP_LogIBLL.GetList(queryJson); - return Success(data); - } - /// - /// 获取列表分页数据 - /// - /// 分页参数 - /// 查询参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = sP_LogIBLL.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 data = sP_LogIBLL.GetEntity(keyValue); - return Success(data); - } - #endregion - - #region 提交数据 - - [HttpPost] - [AjaxOnly] - [ValidateAntiForgeryToken] - public ActionResult SaveRemoveLog(int categoryId, string keepTime) { - - SP_LogBLLStatic.RemoveLog(categoryId, keepTime); - return Success("清空成功"); - } - - - /// - /// 删除实体数据 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - sP_LogIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue,SP_LogEntity entity) - { - sP_LogIBLL.SaveEntity(keyValue, entity); - return Success("保存成功！"); - } - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/StuPayManageAreaRegistration.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/StuPayManageAreaRegistration.cs deleted file mode 100644 index 0fc3b0747..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/StuPayManageAreaRegistration.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; - -namespace Learun.Application.Web.Areas.StuPayManage -{ - public class StuPayManageAreaRegistration : AreaRegistration - { - public override string AreaName - { - get - { - return "StuPayManage"; - } - } - - public override void RegisterArea(AreaRegistrationContext context) - { - context.MapRoute( - "StuPayManage_default", - "StuPayManage/{controller}/{action}/{id}", - new { action = "Index", id = UrlParameter.Optional } - ); - } - } -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Form.cshtml deleted file mode 100644 index fd9e85c82..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Form.cshtml +++ /dev/null @@ -1,39 +0,0 @@ -@{ - ViewBag.Title = "专业收费项目设置"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
收费年度*
-
-
-
-
项目代码*
- -
-
-
项目名称*
- -
-
-
收费标准*
- -
-
-
项目类型*
-
-
-
-
专业*
-
-
-
-
备注
- -
- -
-@Html.AppendJsFile("/Areas/StuPayManage/Views/SP_FeeItem/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Form.js deleted file mode 100644 index af7c33f81..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Form.js +++ /dev/null @@ -1,62 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2023-07-29 18:34 - * 描 述：专业收费项目设置 - */ -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 () { - $('#ChargeItemType').lrDataItemSelect({ code: 'ChargeItemType' }); - $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); - //收费年度 - $('#YearNo').lrselect({ - placeholder: "请选择收费年度", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear', - value: 'value', - text: 'text' - }); - $('#F_Status').lrDataItemSelect({ code: 'SP_AppStatus' }); - $('#F_Status').lrselectSet("0"); - }, - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/StuPayManage/SP_FeeItem/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]); - } - } - }); - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('body').lrValidform()) { - return false; - } - var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) - }; - $.lrSaveForm(top.$.rootUrl + '/StuPayManage/SP_FeeItem/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Index.cshtml deleted file mode 100644 index 12c8a0ee9..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Index.cshtml +++ /dev/null @@ -1,61 +0,0 @@ -@{ - ViewBag.Title = "专业收费项目设置"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
-
-
-
-
-
-
收费年度
-
-
-
-
项目类型
-
-
-
-
项目代码
- -
-
-
项目名称
- -
-
-
专业
-
-
-
-
审核状态
-
-
-
-
-
-
-
-
- -
-
-  新增 -  编辑 -  删除 -
-
-   导入 - @*  导出*@ -   审核 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/StuPayManage/Views/SP_FeeItem/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Index.js deleted file mode 100644 index ff6ae10b1..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_FeeItem/Index.js +++ /dev/null @@ -1,157 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2023-07-29 18:34 - * 描 述：专业收费项目设置 - */ -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 250, 400); - //收费年度 - $('#YearNo').lrselect({ - placeholder: "请选择", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear', - value: 'value', - text: 'text' - }); - $('#ChargeItemType').lrDataItemSelect({ code: 'ChargeItemType' }); - $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); - $('#F_Status').lrDataItemSelect({ code: 'SP_AppStatus' }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/StuPayManage/SP_FeeItem/Form', - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/StuPayManage/SP_FeeItem/Form?keyValue=' + keyValue, - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/StuPayManage/SP_FeeItem/DeleteForms', { keyValue: keyValue}, function () { - refreshGirdData(); - }); - } - }); - } - }); - //  导入 - $('#lr_import').on('click', - function () { - learun.layerForm({ - id: 'form', - title: '导入', - url: top.$.rootUrl + '/PersonnelManagement/Sal_UserSalary/ImportForm', - width: 400, - height: 300, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - //  导出 - $('#lr_export').on('click', function () { - }); - //  审核 - $('#lr_audit').on('click', function () { - }); - }, - // 初始化列表 - initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/StuPayManage/SP_FeeItem/GetPageList', - headData: [ - { label: "收费年度", name: "YearNo", width: 100, align: "center"}, - { label: "项目代码", name: "ChargeItemCode", width: 100, align: "center"}, - { label: "项目名称", name: "ChargeItemName", width: 100, align: "center"}, - { label: "专业", name: "MajorNo", width: 100, align: "center", - 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: "ChargeItemType", width: 100, align: "center", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'ChargeItemType', - callback: function (_data) { - callback(_data.text); - } - }); - }}, - { label: "收费标准", name: "Standard", width: 100, align: "center"}, - { label: "备注", name: "Remark", width: 100, align: "left" }, - { label: "审核状态", name: "F_Status", width: 100, align: "center", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'SP_AppStatus', - callback: function (_data) { - callback(_data.text); - } - }); - } - } - ], - mainId:'F_Id', - isPage: true, - isMultiselect: true, - sord: 'desc', - sidx: 'F_CreateDate' - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#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/StuPayManage/Views/SP_Log/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Form.cshtml deleted file mode 100644 index 1ae0a6265..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Form.cshtml +++ /dev/null @@ -1,18 +0,0 @@ -@{ - ViewBag.Title = "清空日志"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
日志保留时间
-
-
    -
  • 保留近一周
    • -
  • 保留近一个月
    • -
  • 保留近三个月
    • -
  • 不保留，全部删除
    • -
-
-
-
-@Html.AppendJsFile("/Areas/StuPayManage/Views/SP_Log/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Form.js deleted file mode 100644 index c2942cd4b..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Form.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 - * 创建人：陈彬彬 - * 日 期：2017.04.11 - * 描 述：清空日志管理 - */ -var categoryId = request('categoryId'); -var acceptClick; -var bootstrap = function ($, learun) { - "use strict"; - - var page = { - init: function () { - $('#keepTime').lrselect({ maxHeight: 75, placeholder: false }).lrselectSet(7); - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('#form').lrValidform()) { - return false; - } - var postData = $('#form').lrGetFormData(); - postData['categoryId'] = categoryId; - $.lrSaveForm(top.$.rootUrl + '/StuPayManage/SP_Log/SaveRemoveLog', postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Index.cshtml deleted file mode 100644 index f1996dd79..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Index.cshtml +++ /dev/null @@ -1,59 +0,0 @@ -@{ - ViewBag.Title = "日志管理"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
- - @*
  • 操作日志
    • *@ - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    操作用户
    - -
    -
    -
    系统功能
    - -
    -
    -
    操作类型
    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -  清空 -  导出 -
    -
    -
    -
    -
    -
    -
    -
    -@Html.AppendJsFile("/Areas/StuPayManage/Views/SP_Log/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Index.js deleted file mode 100644 index 75568dadd..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/SP_Log/Index.js +++ /dev/null @@ -1,149 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2023-07-31 22:20 - * 描 述：操作日志 - */ -var selectedRow; -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var categoryId = '1'; - var logbegin = ''; - var logend = ''; - - var refreshGirdData = function () { - page.search(); - } - - var page = { - init: function () { - page.initGrid(); - page.bind(); - }, - bind: function () { - $('.datetime').each(function () { - $(this).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) { - logbegin = begin; - logend = end; - page.search(); - } - }); - }); - // 查询 - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 200, 400); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - - // 清空 - $('#lr_removelog').on('click', function () { - learun.layerForm({ - id: 'form', - title: '清空', - url: top.$.rootUrl + '/StuPayManage/SP_Log/Form?categoryId=' + categoryId, - height: 200, - width: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 导出 - $('#lr_export').on('click', function () { - learun.layerForm({ - id: "ExcelExportForm", - title: '导出Excel数据', - url: top.$.rootUrl + '/Utility/ExcelExportForm?gridId=gridtable&filename=SP_Log', - width: 500, - height: 380, - callBack: function (id) { - return top[id].acceptClick(); - }, - btn: ['导出Excel', '关闭'] - }); - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_LogId'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/StuPayManage/SP_Log/DeleteForm', { keyValue: keyValue}, function () { - }); - } - }); - } - }); - }, - - initGrid: function () { - $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/StuPayManage/SP_Log/GetPageList', - headData: [ - { - label: "操作时间", name: "F_OperateTime", width: 135, align: "left", - formatter: function (cellvalue) { - return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss'); - } - }, - { label: "操作用户", name: "F_OperateAccount", width: 140, align: "left" }, - { label: "IP地址", name: "F_IPAddress", width: 100, align: "left" }, - { label: "系统功能", name: "F_Module", width: 150, align: "left" }, - { label: "操作类型", name: "F_OperateType", width: 70, align: "center" }, - { - label: "执行结果", name: "F_ExecuteResult", width: 70, align: "center", - formatter: function (cellvalue) { - if (cellvalue == '1') { - return "成功"; - } else { - return "失败"; - } - } - }, - { label: "执行结果描述", name: "F_ExecuteResultJson", width: 300, align: "left" } - - ], - - mainId: 'F_ItemDetailId', - isPage: true, - sidx: 'F_OperateTime' - }); - }, - search: function (param) { - param = param || {}; - param.CategoryId = categoryId; - param.StartTime = logbegin; - param.EndTime = logend; - - $('#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/StuPayManage/Views/web.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/web.config deleted file mode 100644 index 22271d246..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StuPayManage/Views/web.config +++ /dev/null @@ -1,35 +0,0 @@ - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 6a7ab38e9..a1f415408 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 @@ -316,7 +316,7 @@ - + @@ -565,7 +565,6 @@ - @@ -887,8 +886,6 @@ - - @@ -6649,14 +6646,6 @@ - - - - - - - - @@ -7981,7 +7970,6 @@ - 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 0ffddadcc..dd01ced0e 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 @@ -588,8 +588,7 @@ - - + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/StuPayManage/SP_LogMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/FinaChargeLogMap.cs similarity index 66% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/StuPayManage/SP_LogMap.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/FinaChargeLogMap.cs index 3ddd459d4..cc90c9907 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/StuPayManage/SP_LogMap.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/FinaChargeLogMap.cs @@ -1,6 +1,5 @@ -using Learun.Application.TwoDevelopment; -using Learun.Application.TwoDevelopment.StuPayManage; -using System.Data.Entity.ModelConfiguration; +using System.Data.Entity.ModelConfiguration; +using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement; namespace Learun.Application.Mapping { @@ -11,13 +10,13 @@ namespace Learun.Application.Mapping /// 日 期：2023-07-31 22:20 /// 描 述：操作日志 ///
    - public class SP_LogMap : EntityTypeConfiguration + public class FinaChargeLogMap : EntityTypeConfiguration { - public SP_LogMap() + public FinaChargeLogMap() { #region 表、主键 //表 - this.ToTable("SP_LOG"); + 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.Mapping/StuPayManage/SP_FeeItemMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/StuPayManage/SP_FeeItemMap.cs deleted file mode 100644 index 783d00214..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/StuPayManage/SP_FeeItemMap.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Learun.Application.TwoDevelopment.StuPayManage; -using System.Data.Entity.ModelConfiguration; - -namespace Learun.Application.Mapping -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2023-07-29 21:26 - /// 描 述：专业收费项目设置 - /// - public class SP_FeeItemMap : EntityTypeConfiguration - { - public SP_FeeItemMap() - { - #region 表、主键 - //表 - this.ToTable("SP_FEEITEM"); - //主键 - this.HasKey(t => t.F_Id); - #endregion - - #region 配置关系 - #endregion - } - } -} - 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 b0d937c59..3ef7346a6 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 @@ -1787,8 +1787,7 @@ - - + @@ -1827,13 +1826,10 @@ - - - - - - - + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLL.cs similarity index 78% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogBLL.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLL.cs index 5096e9861..196a25c0c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLL.cs @@ -2,9 +2,8 @@ using System; using System.Data; using System.Collections.Generic; -using Learun.Application.Base.SystemModule; -namespace Learun.Application.TwoDevelopment.StuPayManage +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement { /// /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 @@ -13,9 +12,9 @@ namespace Learun.Application.TwoDevelopment.StuPayManage /// 日 期：2023-07-31 22:20 /// 描 述：操作日志 /// - public class SP_LogBLL : SP_LogIBLL + public class FinaChargeLogBLL : FinaChargeLogIBLL { - private SP_LogService sP_LogService = new SP_LogService(); + private FinaChargeLogService finaChargeLogService = new FinaChargeLogService(); #region 获取数据 @@ -24,11 +23,11 @@ namespace Learun.Application.TwoDevelopment.StuPayManage ///     /// 查询参数 /// - public IEnumerable GetList( string queryJson ) + public IEnumerable GetList( string queryJson ) { try { - return sP_LogService.GetList(queryJson); + return finaChargeLogService.GetList(queryJson); } catch (Exception ex) { @@ -49,11 +48,11 @@ namespace Learun.Application.TwoDevelopment.StuPayManage /// 分页参数 /// 查询参数 /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) + public IEnumerable GetPageList(Pagination pagination, string queryJson) { try { - return sP_LogService.GetPageList(pagination, queryJson); + return finaChargeLogService.GetPageList(pagination, queryJson); } catch (Exception ex) { @@ -73,11 +72,11 @@ namespace Learun.Application.TwoDevelopment.StuPayManage ///     /// 主键 /// - public SP_LogEntity GetEntity(string keyValue) + public FinaChargeLogEntity GetEntity(string keyValue) { try { - return sP_LogService.GetEntity(keyValue); + return finaChargeLogService.GetEntity(keyValue); } catch (Exception ex) { @@ -104,7 +103,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage { try { - sP_LogService.DeleteEntity(keyValue); + finaChargeLogService.DeleteEntity(keyValue); } catch (Exception ex) { @@ -124,11 +123,11 @@ namespace Learun.Application.TwoDevelopment.StuPayManage ///     /// 主键 /// 实体 - public void SaveEntity(string keyValue, SP_LogEntity entity) + public void SaveEntity(string keyValue, FinaChargeLogEntity entity) { try { - sP_LogService.SaveEntity(keyValue, entity); + finaChargeLogService.SaveEntity(keyValue, entity); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogBLLStatic.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLLStatic.cs similarity index 71% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogBLLStatic.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLLStatic.cs index a22af67bb..5b64107d2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogBLLStatic.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogBLLStatic.cs @@ -5,18 +5,18 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Learun.Application.TwoDevelopment.StuPayManage.SP_Log +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement { - public static class SP_LogBLLStatic + public static class FinaChargeLogBLLStatic { - private static SP_LogService sP_LogService = new SP_LogService(); + private static FinaChargeLogService finaChargeLogService = new FinaChargeLogService(); public static void RemoveLog(int categoryId, string keepTime) { try { - sP_LogService.RemoveLog(categoryId, keepTime); + finaChargeLogService.RemoveLog(categoryId, keepTime); } catch (Exception ex) { @@ -37,11 +37,11 @@ namespace Learun.Application.TwoDevelopment.StuPayManage.SP_Log /// 写日志 ///     /// 对象 - public static void WriteLog(this SP_LogEntity logEntity) + public static void WriteLog(this FinaChargeLogEntity logEntity) { try { - sP_LogService.WriteLog(logEntity); + finaChargeLogService.WriteLog(logEntity); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogEntity.cs similarity index 97% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogEntity.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogEntity.cs index b1c331382..b7545f213 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogEntity.cs @@ -1,7 +1,7 @@ using Learun.Util; using System; using System.ComponentModel.DataAnnotations.Schema; -namespace Learun.Application.TwoDevelopment +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement { /// @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment /// 日 期：2023-07-31 22:20 /// 描 述：操作日志 /// - public class SP_LogEntity + public class FinaChargeLogEntity { #region 实体成员 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogIBLL.cs similarity index 77% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogIBLL.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogIBLL.cs index f93a9c15d..3c229666b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogIBLL.cs @@ -2,7 +2,7 @@ using System.Data; using System.Collections.Generic; -namespace Learun.Application.TwoDevelopment.StuPayManage +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement { /// /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage /// 日 期：2023-07-31 22:20 /// 描 述：操作日志 /// - public interface SP_LogIBLL + public interface FinaChargeLogIBLL { #region 获取数据 @@ -20,20 +20,20 @@ namespace Learun.Application.TwoDevelopment.StuPayManage /// /// 查询参数 /// - IEnumerable GetList( string queryJson ); + IEnumerable GetList( string queryJson ); /// /// 获取列表分页数据 /// /// 分页参数 /// 查询参数 /// - IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageList(Pagination pagination, string queryJson); /// /// 获取实体数据 /// /// 主键 /// - SP_LogEntity GetEntity(string keyValue); + FinaChargeLogEntity GetEntity(string keyValue); #endregion #region 提交数据 @@ -48,7 +48,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage ///     /// 主键 /// 实体 - void SaveEntity(string keyValue, SP_LogEntity entity); + void SaveEntity(string keyValue, FinaChargeLogEntity entity); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogService.cs similarity index 88% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogService.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogService.cs index 00734a608..ab6af84ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_Log/SP_LogService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeLog/FinaChargeLogService.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace Learun.Application.TwoDevelopment.StuPayManage +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement { /// /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 @@ -16,7 +16,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage /// 日 期：2023-07-31 22:20 /// 描 述：操作日志 /// - public class SP_LogService : RepositoryFactory + public class FinaChargeLogService : RepositoryFactory { #region 构造函数和属性 @@ -24,7 +24,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage /// /// 构造方法 /// - public SP_LogService() + public FinaChargeLogService() { fieldSql=@" t.F_LogId, @@ -58,7 +58,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage ///     /// 条件参数 /// - public IEnumerable GetList( string queryJson ) + public IEnumerable GetList( string queryJson ) { try { @@ -70,8 +70,8 @@ namespace Learun.Application.TwoDevelopment.StuPayManage var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(fieldSql); - strSql.Append(" FROM SP_Log t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); + strSql.Append(" FROM FinaChargeLog t "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); } catch (Exception ex) { @@ -92,7 +92,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage /// 分页参数 /// 条件参数 /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) + public IEnumerable GetPageList(Pagination pagination, string queryJson) { try { @@ -100,7 +100,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage strSql.Append("SELECT "); strSql.Append(fieldSql); strSql.Append(" FROM SP_Log t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); } catch (Exception ex) { @@ -120,11 +120,11 @@ namespace Learun.Application.TwoDevelopment.StuPayManage ///     /// 主键 /// - public SP_LogEntity GetEntity(string keyValue) + public FinaChargeLogEntity GetEntity(string keyValue) { try { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); } catch (Exception ex) { @@ -164,7 +164,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage { operateTime = DateTime.Now.AddMonths(-3); } - var expression = LinqExtensions.True(); + var expression = LinqExtensions.True(); this.BaseRepository("CollegeMIS").Delete(expression); } @@ -185,7 +185,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage /// 写日志 ///     /// 对象 - public void WriteLog(SP_LogEntity logEntity) + public void WriteLog(FinaChargeLogEntity logEntity) { try { @@ -220,7 +220,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.F_LogId == keyValue); + this.BaseRepository("CollegeMIS").Delete(t=>t.F_LogId == keyValue); } catch (Exception ex) { @@ -240,7 +240,7 @@ namespace Learun.Application.TwoDevelopment.StuPayManage /// 主键 /// 实体 ///     - public void SaveEntity(string keyValue, SP_LogEntity entity) + public void SaveEntity(string keyValue, FinaChargeLogEntity entity) { try { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemBLL.cs deleted file mode 100644 index 9ab4c5e5d..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemBLL.cs +++ /dev/null @@ -1,163 +0,0 @@ -using Learun.Util; -using System; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.StuPayManage -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2023-07-29 18:34 - /// 描 述：专业收费项目设置 - /// - public class SP_FeeItemBLL : SP_FeeItemIBLL - { - private SP_FeeItemService sP_FeeItemService = new SP_FeeItemService(); - - #region 获取数据 - - public IEnumerable GetList(string queryJson) - { - try - { - return sP_FeeItemService.GetList(queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取页面显示列表数据 - /// - /// 分页参数 - /// 查询参数 - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - return sP_FeeItemService.GetPageList(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取SP_FeeItem表实体数据 - /// - /// 主键 - /// - public SP_FeeItemEntity GetSP_FeeItemEntity(string keyValue) - { - try - { - return sP_FeeItemService.GetSP_FeeItemEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - public void DeleteEntity(string keyValue) - { - try - { - sP_FeeItemService.DeleteEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - public void DeleteEntity(IEnumerable entities) { - - try - { - sP_FeeItemService.DeleteEntity(entities); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - public void SaveEntity(string keyValue, SP_FeeItemEntity entity) - { - try - { - sP_FeeItemService.SaveEntity(keyValue, entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemEntity.cs deleted file mode 100644 index ca89b20b5..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemEntity.cs +++ /dev/null @@ -1,138 +0,0 @@ -using Learun.Util; -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace Learun.Application.TwoDevelopment.StuPayManage -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2023-07-29 18:34 - /// 描 述：专业收费项目设置 - /// - public class SP_FeeItemEntity - { - #region 实体成员 - /// - /// 主键 - /// - [Column("F_ID")] - public string F_Id { get; set; } - /// - /// 创建人ID - /// - [Column("F_CREATEUSERID")] - public string F_CreateUserId { get; set; } - /// - /// 创建人 - /// - [Column("F_CREATEUSERNAME")] - public string F_CreateUserName { get; set; } - /// - /// 创建时间 - /// - [Column("F_CREATEDATE")] - public DateTime? F_CreateDate { get; set; } - /// - /// 更新人ID - /// - [Column("F_MODIFYUSERID")] - public string F_ModifyUserId { get; set; } - /// - /// 更新人 - /// - [Column("F_MODIFYUSERNAME")] - public string F_ModifyUserName { get; set; } - /// - /// 更新时间 - /// - [Column("F_MODIFYDATE")] - public DateTime? F_ModifyDate { get; set; } - /// - /// 收费年度 - /// - [Column("YEARNO")] - public string YearNo { get; set; } - /// - /// 项目代码 - /// - [Column("CHARGEITEMCODE")] - public string ChargeItemCode { get; set; } - /// - /// 项目名称 - /// - [Column("CHARGEITEMNAME")] - public string ChargeItemName { get; set; } - /// - /// 项目类型 固定/非固定 - /// - [Column("CHARGEITEMTYPE")] - public int? ChargeItemType { get; set; } - /// - /// 收费标准 decimal(10,2) - /// - [Column("STANDARD")] - public decimal? Standard { get; set; } - /// - /// 专业 - /// - [Column("MAJORNO")] - public string MajorNo { get; set; } - /// - /// 专业名称 - /// - [Column("MAJORNAME")] - public string MajorName { get; set; } - /// - /// 学校 - /// - [Column("F_SCHOOLID")] - public string F_SchoolId { get; set; } - /// - /// 备注 - /// - [Column("REMARK")] - public string Remark { get; set; } - /// - /// 审核标志 审核通过、审核不通过、待审核 - /// - [Column("F_STATUS")] - public int? F_Status { get; set; } - /// - /// 删除标记 0：未删除、1：删除，默认值：0 - /// - [Column("F_DELETEMARK")] - public int? F_DeleteMark { get; set; } - #endregion - - #region 扩展操作 - /// - /// 新增调用 - /// - public void Create() - { - this.F_Id = Guid.NewGuid().ToString(); - this.F_CreateDate = DateTime.Now; - UserInfo userInfo = LoginUserInfo.Get(); - this.F_CreateUserId = userInfo.userId; - this.F_CreateUserName = userInfo.realName; - } - /// - /// 编辑调用 - /// - /// - public void Modify(string keyValue) - { - this.F_Id = keyValue; - this.F_ModifyDate = DateTime.Now; - UserInfo userInfo = LoginUserInfo.Get(); - this.F_ModifyUserId = userInfo.userId; - this.F_ModifyUserName = userInfo.realName; - } - #endregion - #region 扩展字段 - #endregion - } -} - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemIBLL.cs deleted file mode 100644 index 1647615cc..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemIBLL.cs +++ /dev/null @@ -1,62 +0,0 @@ -using Learun.Util; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.StuPayManage -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2023-07-29 18:34 - /// 描 述：专业收费项目设置 - /// - public interface SP_FeeItemIBLL - { - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - /// - IEnumerable GetList(string queryJson); - - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// - IEnumerable GetPageList(Pagination pagination, string queryJson); - /// - /// 获取SP_FeeItem表实体数据 - /// - /// 主键 - /// - SP_FeeItemEntity GetSP_FeeItemEntity(string keyValue); - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - void DeleteEntity(string keyValue); - - /// - /// 批量删除实体数据 - /// - /// 实体数据列表 - void DeleteEntity(IEnumerable entities); - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - void SaveEntity(string keyValue, SP_FeeItemEntity entity); - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemService.cs deleted file mode 100644 index 09f2df278..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StuPayManage/SP_FeeItem/SP_FeeItemService.cs +++ /dev/null @@ -1,230 +0,0 @@ -using Dapper; -using Learun.DataBase.Repository; -using Learun.Util; -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; - -namespace Learun.Application.TwoDevelopment.StuPayManage -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2023-07-29 18:34 - /// 描 述：专业收费项目设置 - /// - public class SP_FeeItemService : RepositoryFactory - { - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - /// - public IEnumerable GetList(string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append(" SELECT t.*"); - strSql.Append(" FROM SP_FeeItem t "); - strSql.Append(" where 1=1 "); - - //参数写法 - var queryParam=queryJson.ToJObject(); - // 虚拟参数 - var dp=new DynamicParameters(new {}); - if (!queryParam["ids"].IsEmpty()) { - dp.Add("ids", $"{queryParam["ids"].ToString()}", DbType.String); - strSql.Append(" and t.F_Id in ( @ids ) "); - } - - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// 查询参数 - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - * - "); - strSql.Append(" FROM SP_FeeItem t "); - strSql.Append(" WHERE 1=1 "); - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - if (!queryParam["YearNo"].IsEmpty()) - { - dp.Add("YearNo",queryParam["YearNo"].ToString(), DbType.String); - strSql.Append(" AND t.YearNo = @YearNo "); - } - if (!queryParam["ChargeItemType"].IsEmpty()) - { - dp.Add("ChargeItemType",queryParam["ChargeItemType"].ToString(), DbType.String); - strSql.Append(" AND t.ChargeItemType = @ChargeItemType "); - } - if (!queryParam["ChargeItemCode"].IsEmpty()) - { - dp.Add("ChargeItemCode", "%" + queryParam["ChargeItemCode"].ToString() + "%", DbType.String); - strSql.Append(" AND t.ChargeItemCode Like @ChargeItemCode "); - } - if (!queryParam["ChargeItemName"].IsEmpty()) - { - dp.Add("ChargeItemName", "%" + queryParam["ChargeItemName"].ToString() + "%", DbType.String); - strSql.Append(" AND t.ChargeItemName Like @ChargeItemName "); - } - if (!queryParam["MajorNo"].IsEmpty()) - { - dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String); - strSql.Append(" AND t.MajorNo = @MajorNo "); - } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取SP_FeeItem表实体数据 - /// - /// 主键 - /// - public SP_FeeItemEntity GetSP_FeeItemEntity(string keyValue) - { - try - { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - public void DeleteEntity(string keyValue) - { - try - { - this.BaseRepository("CollegeMIS").Delete(t=>t.F_Id == keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - - /// - /// 批量删除实体数据 - /// - /// 实体数据列表 - public void DeleteEntity(IEnumerable entities) - { - try - { - this.BaseRepository("CollegeMIS").Delete>(entities); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - public void SaveEntity(string keyValue, SP_FeeItemEntity 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/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperationType.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperationType.cs index 041be9dde..245118831 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperationType.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperationType.cs @@ -66,5 +66,11 @@ namespace Learun.Util.Operat ///     [Description("移动登录")] AppLogin = 10, + + [Description("审核、启用")] + Lock = 11, + + [Description("去审核、停用")] + UnLock = 12, } }