From 0247721af165abbbf8c99b891e1e1b81db8164a5 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 14 Apr 2023 15:55:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=A0=A1?= =?UTF-8?q?=E7=BA=A7=E5=A5=96=E5=AD=A6=E9=87=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchoolLevelScholarshipController.cs | 47 ++- .../Views/SchoolLevelScholarship/Index.cshtml | 7 +- .../Views/SchoolLevelScholarship/Index.js | 31 +- .../IndexOfThree.cshtml | 73 +++++ .../SchoolLevelScholarship/IndexOfThree.js | 301 +++++++++++++++++ .../SchoolLevelScholarship/IndexOfTwo.cshtml | 75 +++++ .../SchoolLevelScholarship/IndexOfTwo.js | 304 ++++++++++++++++++ .../Learun.Application.Web.csproj | 4 + .../SchoolLevelScholarshipBLL.cs | 47 +++ .../SchoolLevelScholarshipIBLL.cs | 14 + .../SchoolLevelScholarshipService.cs | 86 +++++ 11 files changed, 977 insertions(+), 12 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolLevelScholarshipController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolLevelScholarshipController.cs index f269ab66c..abdf70500 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolLevelScholarshipController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolLevelScholarshipController.cs @@ -51,6 +51,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 主页面【二级学院】 + /// + /// + [HttpGet] + public ActionResult IndexOfTwo() + { + return View(); + } + /// + /// 主页面【学工部】 + /// + /// + [HttpGet] + public ActionResult IndexOfThree() + { + return View(); + } #endregion @@ -209,11 +227,34 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { SchoolLevelScholarshipEntity entity = strEntity.ToObject(); schoolLevelScholarshipIBLL.SaveEntity(keyValue, entity); - if (string.IsNullOrEmpty(keyValue)) - { - } return Success("保存成功！"); } + + /// + /// 提交 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoSubmit(string keyValue, string status, string step) + { + schoolLevelScholarshipIBLL.DoSubmit(keyValue, status, step); + return Success("操作成功！"); + } + /// + /// 退回 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoBack(string keyValue, string status, string step) + { + schoolLevelScholarshipIBLL.DoBack(keyValue, status, step); + return Success("操作成功！"); + } + #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml index e5d17acba..6bbf19b1f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml @@ -60,10 +60,13 @@
-  新增 -  编辑 +  新增 +  编辑  删除
+
+  提交二级学院 +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js index a034494d3..352deb76c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js @@ -131,7 +131,24 @@ var bootstrap = function ($, learun) { }); } }); - + // 提交二级学院审核 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "0") { + learun.alert.warning("当前项不属于草稿状态，无法提交学院审核！"); + return false; + } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoSubmit', { keyValue: keyValue, status: '1', step: '1' }, function () { + refreshGirdData(); + }); + } + }); + } + }); }, // 初始化列表 initGird: function () { @@ -175,11 +192,11 @@ var bootstrap = function ($, learun) { } }, { label: "身份证件号", name: "IdCard", width: 100, align: "left"}, - { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, - { label: "学期", name: "Semester", width: 100, align: "left" }, + { label: "学年", name: "AcademicYearNo", width: 50, align: "left" }, + { label: "学期", name: "Semester", width: 50, align: "left" }, { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"}, { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"}, - { label: "资助等级", name: "FundingLevel", width: 100, align: "left", + { label: "资助等级", name: "FundingLevel", width: 70, align: "left", formatterAsync: function (callback, value, row, op,$cell) { learun.clientdata.getAsync('dataItem', { key: value, @@ -189,9 +206,9 @@ var bootstrap = function ($, learun) { } }); }}, - { label: "资助标准", name: "FundingCriteria", width: 100, align: "left"}, - { label: "应发金额", name: "ShoudAmount", width: 100, align: "left"}, - { label: "实发金额", name: "ActualAmount", width: 100, align: "left"}, + { label: "资助标准", name: "FundingCriteria", width: 70, align: "left"}, + { label: "应发金额", name: "ShoudAmount", width: 70, align: "left"}, + { label: "实发金额", name: "ActualAmount", width: 70, align: "left"}, { label: "申请日期", name: "ApplyDate", width: 100, align: "left", formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.cshtml new file mode 100644 index 000000000..6e464c0e4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.cshtml @@ -0,0 +1,73 @@ +@{ + ViewBag.Title = "校级奖学金"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + +
+
+
+
+
+
申请
+
+
+
+
发放
+
+
+
+
+
+
+
+
所属院系
+
+
+
+
所属班级
+
+
+
+
身份证件号
+ +
+
+
资助等级
+
+
+
+
开户行账号
+ +
+
+
+
+
+
+
+ +
+
+  归档 +  退回辅导员 +  退回二级学院 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.js new file mode 100644 index 000000000..daae5c7fe --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfThree.js @@ -0,0 +1,301 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-03-16 11:49 + * 描 述：校级奖学金 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var startTime; + var endTime; + var startTimeRelease; + var endTimeRelease; + 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(); + } + }); + $('#datesearchRelease').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) { + startTimeRelease = begin; + endTimeRelease = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 250, 400); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); + $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' }); + $('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 归档 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "2") { + learun.alert.warning("当前项不属于学工部审核状态，无法提交归档！"); + return false; + } + learun.layerConfirm('是否确认归档该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoSubmit', { keyValue: keyValue, status: '3', step: '3' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 退回辅导员 + $('#lr_back').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "2") { + learun.alert.warning("当前项不属于学工部审核状态，无法退回辅导员！"); + return false; + } + learun.layerConfirm('是否确认退回该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoBack', { keyValue: keyValue, status: '0', step: '3' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 退回二级学院 + $('#lr_backTwo').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "2") { + learun.alert.warning("当前项不属于学工部审核状态，无法退回二级学院！"); + return false; + } + learun.layerConfirm('是否确认退回该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoBack', { keyValue: keyValue, status: '1', step: '3' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetPageList', + headData: [ + { label: "学号", name: "StuNo", width: 100, align: "left"}, + { label: "姓名", name: "StuName", width: 100, align: "left"}, + { label: "所属院系", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + }}, + { label: "所属班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + }}, + { + label: "身份证件类型", name: "IdCardType", width: 100, align: "left" + , formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IdCardType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "身份证件号", name: "IdCard", width: 100, align: "left"}, + { label: "学年", name: "AcademicYearNo", width: 50, align: "left" }, + { label: "学期", name: "Semester", width: 50, align: "left" }, + { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"}, + { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"}, + { label: "资助等级", name: "FundingLevel", width: 70, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'SchoolFundingLevel', + callback: function (_data) { + callback(_data.text); + } + }); + }}, + { label: "资助标准", name: "FundingCriteria", width: 70, align: "left"}, + { label: "应发金额", name: "ShoudAmount", width: 70, align: "left"}, + { label: "实发金额", name: "ActualAmount", width: 70, align: "left"}, + { + label: "申请日期", name: "ApplyDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { + label: "发放日期", name: "ProvideDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { label: "申请理由", name: "ApplyAccount", width: 100, align: "left"}, + { + label: "开户银行", name: "DepositBank", width: 100, align: "left" + , formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'DepositBank', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "开户行账号", name: "BankCard", width: 100, align: "left"}, + { label: "开户行号", name: "BankCode", width: 100, align: "left"}, + { label: "备注说明", name: "Remark", width: 100, align: "left" }, + { + label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "已归档" : "草稿"; + } + }, + { + label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '创建时间', name: 'CreateTime', width: 130, align: "left" }, + { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" }, + { + label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" }, + { + label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" }, + ], + mainId:'Id', + isPage: true, + sidx: 'FirstCheckTime desc' + }); + }, + search: function (param) { + param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; + param.StartTimeRelease = startTimeRelease; + param.EndTimeRelease = endTimeRelease; + param.Step = "3";//第三步：学工部审核 + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.cshtml new file mode 100644 index 000000000..87fe78d02 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.cshtml @@ -0,0 +1,75 @@ +@{ + ViewBag.Title = "校级奖学金"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + +
+
+
+
+
+
申请
+
+
+
+
发放
+
+
+
+
+
+
+
+
所属院系
+
+
+
+
所属班级
+
+
+
+
身份证件号
+ +
+
+
资助等级
+
+
+
+
开户行账号
+ +
+
+
+
+
+
+
+ +
+
+  审核 +
+
+  提交学工部 +  退回辅导员 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.js new file mode 100644 index 000000000..ccbb945ce --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexOfTwo.js @@ -0,0 +1,304 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-03-16 11:49 + * 描 述：校级奖学金 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var startTime; + var endTime; + var startTimeRelease; + var endTimeRelease; + 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(); + } + }); + $('#datesearchRelease').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) { + startTimeRelease = begin; + endTimeRelease = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 250, 400); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); + $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' }); + $('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "1") { + learun.alert.warning("当前项不属于学院审核状态，无法编辑！"); + return false; + } + learun.layerForm({ + id: 'formOfTwo', + title: '审核', + url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form?Step=2&keyValue=' + keyValue, + width: 1100, + height: 700, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 提交学工部审核 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "1") { + learun.alert.warning("当前项不属于学院审核状态，无法提交学工部审核！"); + return false; + } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoSubmit', { keyValue: keyValue, status: '2', step: '2' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 退回辅导员 + $('#lr_back').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "1") { + learun.alert.warning("当前项不属于学院审核状态，无法退回辅导员！"); + return false; + } + learun.layerConfirm('是否确认退回该项！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DoBack', { keyValue: keyValue, status: '0', step: '2' }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetPageList', + headData: [ + { label: "学号", name: "StuNo", width: 100, align: "left"}, + { label: "姓名", name: "StuName", width: 100, align: "left"}, + { label: "所属院系", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + }}, + { label: "所属班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + }}, + { + label: "身份证件类型", name: "IdCardType", width: 100, align: "left" + , formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IdCardType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "身份证件号", name: "IdCard", width: 100, align: "left"}, + { label: "学年", name: "AcademicYearNo", width: 50, align: "left" }, + { label: "学期", name: "Semester", width: 50, align: "left" }, + { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"}, + { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"}, + { label: "资助等级", name: "FundingLevel", width: 70, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'SchoolFundingLevel', + callback: function (_data) { + callback(_data.text); + } + }); + }}, + { label: "资助标准", name: "FundingCriteria", width: 70, align: "left"}, + { label: "应发金额", name: "ShoudAmount", width: 70, align: "left"}, + { label: "实发金额", name: "ActualAmount", width: 70, align: "left"}, + { + label: "申请日期", name: "ApplyDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { + label: "发放日期", name: "ProvideDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { label: "申请理由", name: "ApplyAccount", width: 100, align: "left"}, + { + label: "开户银行", name: "DepositBank", width: 100, align: "left" + , formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'DepositBank', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "开户行账号", name: "BankCard", width: 100, align: "left"}, + { label: "开户行号", name: "BankCode", width: 100, align: "left"}, + { label: "备注说明", name: "Remark", width: 100, align: "left" }, + { + label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "已归档" : "草稿"; + } + }, + { + label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '创建时间', name: 'CreateTime', width: 130, align: "left" }, + { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" }, + { + label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" }, + { + label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" }, + ], + mainId:'Id', + isPage: true, + sidx: 'SubmitTime desc' + }); + }, + search: function (param) { + param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; + param.StartTimeRelease = startTimeRelease; + param.EndTimeRelease = endTimeRelease; + param.Step = "2";//第二步：二级学院审核 + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} 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 0b380a489..f6df536c4 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 @@ -996,6 +996,8 @@ + + @@ -8130,6 +8132,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipBLL.cs index d626557e5..b25194be7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipBLL.cs @@ -119,6 +119,53 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + + /// + /// 提交 + /// + /// 主键 + public void DoSubmit(string keyValue, string status, string step) + { + try + { + schoolLevelScholarshipService.DoSubmit(keyValue, status, step); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 退回 + /// + /// 主键 + public void DoBack(string keyValue, string status, string step) + { + try + { + schoolLevelScholarshipService.DoBack(keyValue, status, step); + } + 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/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipIBLL.cs index 904a07f6a..e969584f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipIBLL.cs @@ -42,6 +42,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// 实体 void SaveEntity(string keyValue, SchoolLevelScholarshipEntity entity); + + + /// + /// 提交 + /// + /// 主键 + void DoSubmit(string keyValue, string status, string step); + + /// + /// 退回 + /// + /// 主键 + void DoBack(string keyValue, string status, string step); + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs index 2dd622986..ea8d7a621 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs @@ -33,6 +33,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration strSql.Append("SELECT t.* "); strSql.Append(" FROM SchoolLevelScholarship t "); strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo "); + strSql.Append(" left join ClassInfo c on t.CreateUserNo=c.ClassTutorNo and s.ClassNo=c.ClassNo "); + strSql.Append(" left join CdDept d on c.DeptNo=d.DeptNo "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -79,6 +81,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("BankCard", "%" + queryParam["BankCard"].ToString() + "%", DbType.String); strSql.Append(" AND t.BankCard Like @BankCard "); } + if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "2")//第二步：二级学院审核 + { + //不查看状态为草稿的记录 + strSql.Append(" AND t.Status > 0 "); + //二级学院审核专员==系部负责人==登录用户 + strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' "); + } + if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核 + { + //不查看状态为学工部审核之前的记录 + strSql.Append(" AND t.Status > 1 "); + } + if (!queryParam["Status"].IsEmpty()) + { + dp.Add("Status", queryParam["Status"].ToString(), DbType.String); + strSql.Append(" AND t.Status = @Status "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); } catch (Exception ex) @@ -178,6 +197,73 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + + /// + /// 提交 + /// + /// 主键 + public void DoSubmit(string keyValue, string status, string step) + { + try + { + if (step == "1")//第一步：提交二级学院审核 + { + this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set SubmitTime='{DateTime.Now}',SubmitUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' "); + } + else if (step == "2")//第二步：提交学工部审核 + { + this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' "); + } + else if (step == "3")//第三步：归档 + { + this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' "); + } + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 退回 + /// + /// 主键 + public void DoBack(string keyValue, string status, string step) + { + try + { + if (step == "2")//第二步：退回辅导员 + { + this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' "); + } + else if (step == "3")//第三步：退回辅导员、退回二级学院 + { + this.BaseRepository("CollegeMIS").ExecuteBySql($"update SchoolLevelScholarship set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' "); + } + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion }