diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index 8b6bbbca1..2593a693c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -167,6 +167,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 助学贷款表单页 + /// + /// + [HttpGet] + public ActionResult LoanForm() + { + return View(); + } + /// + /// 现场缴费表单页 + /// + /// + [HttpGet] + public ActionResult OnsitePayForm() + { + return View(); + } /// /// 主页面【学子在线-新生信息完善】 @@ -409,6 +427,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("保存成功！"); } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveLoanForm(string keyValue, string strEntity) + { + StuInfoFreshEntity entity = strEntity.ToObject(); + stuInfoFreshIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + #endregion #region 扩展数据 @@ -489,7 +522,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("操作成功"); } /// - ///领取用品 + ///领取钥匙 /// /// [HttpPost] @@ -500,6 +533,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("操作成功"); } /// + ///领取校园卡 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult IsGetCard(string keyValue, string status) + { + stuInfoFreshIBLL.IsGetCard(keyValue, status); + return Success("操作成功"); + } + /// ///缴费 /// /// @@ -510,6 +554,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuInfoFreshIBLL.IsPayFee(keyValue, status); return Success("操作成功"); } + + /// + ///其他费用缴费 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult IsOtherPayFee(string keyValue, string status) + { + stuInfoFreshIBLL.IsOtherPayFee(keyValue, status); + return Success("操作成功"); + } /// /// 获取新生缴费明细 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml index 7078893eb..450ede936 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml @@ -125,6 +125,10 @@
家庭地址 *
+
+
精准贫困户
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index 365080033..5b96bdf5c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js @@ -24,6 +24,7 @@ var bootstrap = function ($, learun) { $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' }); $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' }); $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); + $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#StuInfoFreshFamily').jfGrid({ headData: [ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml index 0daa46c0e..a528eb6f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml @@ -145,6 +145,10 @@
家庭地址 *
+
+
精准贫困户
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js index dafb70cee..a8bad38eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js @@ -24,6 +24,8 @@ var bootstrap = function ($, learun) { $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' }); $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' }); $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); + $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' }); + $('#StuInfoFreshFamily').jfGrid({ headData: [ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.cshtml index fc4ad1649..11fe2af88 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.cshtml @@ -37,8 +37,10 @@
 查看 -  领取饭卡钥匙 -  设置未领取 +  领取钥匙 +  设置未领取钥匙 +  领取校园卡 +  设置未领取校园卡
 删除宿舍信息 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js index b6931031c..afcc0904e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js @@ -50,16 +50,16 @@ var bootstrap = function ($, learun) { }); } }); - // 领取饭卡钥匙 + // 领取钥匙 $('#lr_get').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.GetKeyStatus == "1") { - learun.alert.warning("当前新生已领取饭卡钥匙！"); + learun.alert.warning("当前新生已领取钥匙！"); return; } - learun.layerConfirm('是否确认领取饭卡钥匙！', function (res) { + learun.layerConfirm('是否确认领取钥匙！', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetKey', { keyValue: keyValue, status: 1 }, function () { refreshGirdData(); @@ -68,16 +68,16 @@ var bootstrap = function ($, learun) { }); } }); - // 设置未领取 + // 设置未领取钥匙 $('#lr_cancelGet').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.GetKeyStatus != "1") { - learun.alert.warning("当前新生暂未领取饭卡钥匙！"); + learun.alert.warning("当前新生暂未领取钥匙！"); return; } - learun.layerConfirm('是否设置新生未领取饭卡钥匙！', function (res) { + learun.layerConfirm('是否设置新生未领取钥匙！', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetKey', { keyValue: keyValue, status: 0 }, function () { refreshGirdData(); @@ -86,6 +86,43 @@ var bootstrap = function ($, learun) { }); } }); + + // 领取校园卡 + $('#lr_getCard').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (selectedRow.GetCardStatus == "1") { + learun.alert.warning("当前新生已领取校园卡！"); + return; + } + learun.layerConfirm('是否确认领取校园卡！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetCard', { keyValue: keyValue, status: 1 }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 设置未领取校园卡 + $('#lr_cancelGetCard').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (selectedRow.GetCardStatus != "1") { + learun.alert.warning("当前新生暂未领取校园卡！"); + return; + } + learun.layerConfirm('是否设置新生未领取校园卡！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetCard', { keyValue: keyValue, status: 0 }, function () { + refreshGirdData(); + }); + } + }); + } + }); // 删除宿舍信息 $('#lr_deleteBed').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); @@ -100,7 +137,11 @@ var bootstrap = function ($, learun) { return; } if (selectedRow.GetKeyStatus == "1") { - learun.alert.warning("当前新生已领取饭卡钥匙，无法删除宿舍信息！"); + learun.alert.warning("当前新生已领取钥匙，无法删除宿舍信息！"); + return; + } + if (selectedRow.GetCardStatus == "1") { + learun.alert.warning("当前新生已领取校园卡，无法删除宿舍信息！"); return; } learun.layerConfirm('是否确认删除宿舍信息！', function (res) { @@ -146,22 +187,28 @@ var bootstrap = function ($, learun) { }, { label: '报到时间', name: 'ArriveDate', width: 130, align: "left" }, { - label: '缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) { + label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) { return value == 1 ? "已缴费" : "未缴费"; } }, - { label: '缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, + { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, { label: '宿舍信息', name: 'DormitoryName', width: 180, align: "left", formatter: function (value, row) { return "" + (row.Build ? row.Build : '') + (row.Room ? row.Room : '') + (row.Bed ? row.Bed : '') + ""; } }, { - label: '领取状态', name: 'GetKeyStatus', width: 100, align: "left", formatter: function (value) { + label: '领取钥匙状态', name: 'GetKeyStatus', width: 100, align: "left", formatter: function (value) { + return value == 1 ? "已领取" : "未领取"; + } + }, + { label: '领取钥匙时间', name: 'GetKeyDate', width: 130, align: "left" }, + { + label: '领取校园卡状态', name: 'GetCardStatus', width: 100, align: "left", formatter: function (value) { return value == 1 ? "已领取" : "未领取"; } }, - { label: '领取时间', name: 'GetKeyDate', width: 130, align: "left" }, + { label: '领取校园卡时间', name: 'GetCardDate', width: 130, align: "left" }, { label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.cshtml new file mode 100644 index 000000000..67110d0af --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.cshtml @@ -0,0 +1,13 @@ +@{ + ViewBag.Title = "助学贷款"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
贷款回执码
+ +
+ + +
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js new file mode 100644 index 000000000..f0399d93b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/LoanForm.js @@ -0,0 +1,52 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-08-08 17:21 + * 描 述：助学贷款 + */ +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 () { + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (id == "StuInfoFresh") { + 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 = {}; + postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData()); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveLoanForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.cshtml new file mode 100644 index 000000000..7151e3c17 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.cshtml @@ -0,0 +1,13 @@ +@{ + ViewBag.Title = "现场缴费"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
缴费状态*
+
+
+ + +
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.js new file mode 100644 index 000000000..9a8138180 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/OnsitePayForm.js @@ -0,0 +1,53 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-08-08 17:21 + * 描 述：现场缴费 + */ +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 () { + $('#OnsitePayFeeStatus').lrDataItemSelect({ code: 'OnsitePayStatus' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (id == "StuInfoFresh") { + 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 = {}; + postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData()); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveLoanForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml index 42f3c730e..e5b7fde37 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml @@ -1,4 +1,6 @@ @{ + /**/ + ViewBag.Title = "新生缴费管理"; Layout = "~/Views/Shared/_Index.cshtml"; } @@ -19,8 +21,14 @@
-  查看 -  缴费 +  查看 + @* 缴费*@ +  线上缴费 +  取消线上缴费 +  助学贷款 +  现场缴费 +  其他费用缴费 +  取消其他费用缴费
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index 6d07f40db..e2f0eb861 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -53,6 +53,113 @@ var bootstrap = function ($, learun) { }); } }); + // 线上缴费 + $('#lr_pay').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (selectedRow.PayFeeStatus == "1") { + learun.alert.warning("当前新生已线上缴费！"); + return; + } + learun.layerConfirm('是否确认线上缴费！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsPayFee', { keyValue: keyValue, status: 1 }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 取消线上缴费 + $('#lr_cancelPay').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (selectedRow.PayFeeStatus != "1") { + learun.alert.warning("当前新生未线上缴费！"); + return; + } + learun.layerConfirm('是否确认取消线上缴费！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsPayFee', { keyValue: keyValue, status: 0 }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 助学贷款 + $('#lr_loan').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'loanForm', + title: '助学贷款', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/LoanForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 现场缴费 + $('#lr_onsitePay').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'onsitePayForm', + title: '现场缴费', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/OnsitePayForm?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 其他费用缴费 + $('#lr_otherPay').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (selectedRow.OtherPayFeeStatus == "1") { + learun.alert.warning("当前新生其他费用已缴费！"); + return; + } + learun.layerConfirm('是否确认其他费用缴费！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsOtherPayFee', { keyValue: keyValue, status: 1 }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 取消其他费用缴费 + $('#lr_cancelOtherPay').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + if (selectedRow.OtherPayFeeStatus != "1") { + learun.alert.warning("当前新生其他费用未缴费！"); + return; + } + learun.layerConfirm('是否确认取消其他费用缴费！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsOtherPayFee', { keyValue: keyValue, status: 0 }, function () { + refreshGirdData(); + }); + } + }); + } + }); + }, initGird: function () { $('#gridtable').lrAuthorizeJfGrid({ @@ -63,11 +170,38 @@ var bootstrap = function ($, learun) { { label: '学号', name: 'StuNo', width: 100, align: "left" }, { label: '姓名', name: 'StuName', width: 100, align: "left" }, { - label: '缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) { + label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) { + return value == 1 ? "已缴费" : "未缴费"; + } + }, + { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, + { label: '助学贷款', name: 'StudentLoan', width: 130, align: "left" }, + { + label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'OnsitePayStatus', + callback: function (_data) { + //callback(_data.text); + if (_data.text) { + if (_data.text == "已缴费") { + callback('' + _data.text + ''); + } else { + callback('' + _data.text + ''); + } + } else { + callback('未缴费'); + } + } + }); + } + }, + { + label: '其他费用缴费状态', name: 'OtherPayFeeStatus', width: 100, align: "left", formatter: function (value) { return value == 1 ? "已缴费" : "未缴费"; } }, - { label: '缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, + { label: '其他费用缴费时间', name: 'OtherPayFeeDate', width: 130, align: "left" }, { label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml index 26af0a108..0f8eb81cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml @@ -7,10 +7,6 @@
主题*
-
-
指定接收人*
-
-
文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js index 4e116d05f..0ceb8014a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js @@ -27,7 +27,6 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#SpecifyReceiver').lrUserSelect({ type: '1' }); $('#Url').lrUploader(); var ContentsUE = UE.getEditor('Contents'); $('#Contents')[0].ue = ContentsUE; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js index 2a3ddd474..c2b347179 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js @@ -142,12 +142,11 @@ var bootstrap = function ($, learun) { // 下发审批指定接收人 $('#lr_IssueSpecifyReceiver').on('click', function () { var keyValue = $('#gridtable').jfGridValue('SFileId'); - var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver'); if (learun.checkrow(keyValue)) { learun.layerForm({ id: 'form', title: '下发审批指定接收人', - url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue + '&specifyReceiver=' + specifyReceiver, + url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue, width: 800, height: 200, callBack: function (id) { @@ -191,39 +190,10 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList', headData: [ { label: "主题", name: "Title", width: 300, align: "left" }, - { - label: "已接收", name: "Receiver", width: 300, align: "left" - }, - { - label: "审批指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync: - function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('user', - { - key: value, - callback: function (_data) { - if (_data.length > 0) { - var text = ''; - $.each(_data, - function (i, item) { - if (item) { - text += item.name + ','; - } - }); - text = text.substring(0, text.lastIndexOf(',')); - callback(text); - } else { - callback(_data.name); - } - } - }); - } - }, - { - label: "下发人", name: "Sender", width: 100, align: "left" - }, - { - label: "下发时间", name: "SendTime", width: 150, align: "left" - }, + { label: "已接收", name: "Receiver", width: 300, align: "left" }, + { label: "审批意见", name: "SpecifyReceiver", width: 300, align: "left" }, + { label: "下发人", name: "Sender", width: 100, align: "left" }, + { label: "下发时间", name: "SendTime", width: 150, align: "left" }, { label: "状态", name: "SendFlag", width: 100, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 4d2563731..544387f89 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -1,6 +1,7 @@ using Learun.Application.WorkFlow; using Learun.Util; using System.Collections.Generic; +using System.Linq; using System.Web.Mvc; using Learun.Application.Organization; using Learun.Application.Base.AuthorizeModule; @@ -20,6 +21,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL(); private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); + private UserIBLL userIbll = new UserBLL(); private UserRelationIBLL userRelationIBLL = new UserRelationBLL(); @@ -97,6 +99,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { return View(); } + /// /// 合同打印 /// @@ -105,22 +108,36 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers public ActionResult htPrint(string keyValue) { + //获取校长的签名盖章 + var listTaskLog = nWFTaskIBLL.GetLogList(keyValue); + var nwfTaskLogEntity = listTaskLog.FirstOrDefault(a => a.F_TaskUserName == "关亮"); + if (nwfTaskLogEntity != null) + { + ViewBag.StampImg = nwfTaskLogEntity.F_StampImg; + ViewBag.SignImg = nwfTaskLogEntity.F_SignImg; + } + + var data = nWFProcessIBLL.GetHTInfo(keyValue); - var userInfo = userIbll.GetEntityByUserId(data.F_CreateUserName); - var beginTime = data.LC_htkssj.ToDate(); - var endTime = data.LC_htjssj.ToDate(); - var operationTime = data.OperationTime.ToDate(); + var userInfo = new UserEntity(); + if (data != null) + { + userInfo = userIbll.GetEntityByUserId(data.F_CreateUserName); + } + var beginTime = data?.LC_htkssj.ToDate(); + var endTime = data?.LC_htjssj.ToDate(); + var operationTime = data?.OperationTime.ToDate(); ViewBag.UserName = userInfo?.F_RealName; ViewBag.IDCard = userInfo?.F_IdentityCardNo; - ViewBag.BeginYear = beginTime.Year; - ViewBag.BeginMonth = beginTime.Month; - ViewBag.BeginDay = beginTime.Day; - ViewBag.EndYear = endTime.Year; - ViewBag.EndMonth = endTime.Month; - ViewBag.EndDay = endTime.Day; - ViewBag.OperationYear = operationTime.Year; - ViewBag.OperationMonth = operationTime.Month; - ViewBag.OperationDay = operationTime.Day; + ViewBag.BeginYear = beginTime?.Year; + ViewBag.BeginMonth = beginTime?.Month; + ViewBag.BeginDay = beginTime?.Day; + ViewBag.EndYear = endTime?.Year; + ViewBag.EndMonth = endTime?.Month; + ViewBag.EndDay = endTime?.Day; + ViewBag.OperationYear = operationTime?.Year; + ViewBag.OperationMonth = operationTime?.Month; + ViewBag.OperationDay = operationTime?.Day; return View(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js index 1d42e49d2..97f12ff6a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js @@ -160,8 +160,9 @@ var bootstrap = function ($, learun) { var isaAain = false; if (categoryId == '1') { - if (row.F_IsFinished != 0 && row.F_SchemeCode == 'LC_Contract_') { - $cell.on('click', '.print', function () {// 催办审核 + //如果流程是合同审批 并且校长审批通过的话可以打印 + if (row.LeaderIsAgree && row.F_SchemeCode == 'LC_Contract_') { + $cell.on('click', '.print', function () { learun.layerForm({ id: 'print', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js index 39a72edd3..d91892af3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js @@ -236,6 +236,8 @@ var bootstrap = function ($, learun) { }); // 打印表单 $('#print').on('click', function () { + //打印checkbox 选中效果打印不出来 + $("input[type='checkbox']:checked").attr('checked', 'checked'); var $iframes = $('#form_list_iframes'); var iframeId = $iframes.find('.form-list-iframe.active').attr('id'); if (iframeId) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml index 57fbf1666..bd37293b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml @@ -33,11 +33,16 @@ 委托人：关亮(身份证号码：110111196506121035)
- (签字) + (签字) + ) +
+ @ViewBag.OperationYear 年@ViewBag.OperationMonth 月@ViewBag.OperationDay 日
+ + @@ -46,10 +51,28 @@ - + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css index fa95af6b3..658d88d4b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css @@ -84,6 +84,7 @@ table { text-indent: 32px; font-size: 14px; line-height: 30px; + position: relative; } .entrTxt span { @@ -97,13 +98,24 @@ table { text-indent: 0; text-align: center } - +#signImg { + position: absolute; + width: 250px; + top: 40px; + left: 100px; +} .entrTime { text-align: right; padding-right: 80px; margin-top: 120px; + position: relative; +} +#stampImg { + position: absolute; + width: 140px; + top: 60px; + left: 170px; } - .entrTime span { display: inline-block; width: 50px; 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 a8c78b33a..5f39f2e32 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 @@ -952,6 +952,8 @@ + + @@ -988,6 +990,7 @@ + @@ -6802,6 +6805,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs index 728828dbd..ff3406b37 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs @@ -408,6 +408,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(string keyValue, StuInfoFreshEntity entity) + { + try + { + stuInfoFreshService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion #region 扩展数据 @@ -461,7 +485,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } /// - /// 领取用品 + /// 领取钥匙 /// 主键 /// /// @@ -484,6 +508,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 领取校园卡 + /// 主键 + /// + /// + public void IsGetCard(string keyValue, string status) + { + try + { + stuInfoFreshService.IsGetCard(keyValue, status); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 缴费 /// 主键 @@ -508,6 +556,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 其他费用缴费 + /// 主键 + /// + /// + public void IsOtherPayFee(string keyValue, string status) + { + try + { + stuInfoFreshService.IsOtherPayFee(keyValue, status); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 分配班级 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs index 21bd83b50..4c91ad5c4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs @@ -465,29 +465,71 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("COLLECTFILESTATUS")] public string CollectFileStatus { get; set; } /// - /// 领取饭卡钥匙时间 + /// 领取钥匙时间 /// /// [Column("GETKEYDATE")] public DateTime? GetKeyDate { get; set; } /// - /// 领取饭卡钥匙状态 + /// 领取钥匙状态 /// /// [Column("GETKEYSTATUS")] public string GetKeyStatus { get; set; } /// + /// 领取校园卡时间 + /// + /// + [Column("GETCARDDATE")] + public DateTime? GetCardDate { get; set; } + /// + /// 领取校园卡状态 + /// + /// + [Column("GETCARDSTATUS")] + public string GetCardStatus { get; set; } + /// /// 缴费时间 /// /// [Column("PAYFEEDATE")] public DateTime? PayFeeDate { get; set; } /// - /// 缴费状态 + /// 线上缴费状态 /// /// [Column("PAYFEESTATUS")] public string PayFeeStatus { get; set; } + /// + /// 助学贷款：贷款回执码 + /// + /// + [Column("STUDENTLOAN")] + public string StudentLoan { get; set; } + /// + /// 现场缴费状态 + /// + /// + [Column("ONSITEPAYFEESTATUS")] + public string OnsitePayFeeStatus { get; set; } + /// + /// 其他费用缴费时间（班费、体检费、军训费、） + /// + /// + [Column("OTHERPAYFEEDATE")] + public DateTime? OtherPayFeeDate { get; set; } + /// + /// 其他费用缴费状态（班费、体检费、军训费、） + /// + /// + [Column("OTHERPAYFEESTATUS")] + public string OtherPayFeeStatus { get; set; } + /// + /// 是否精准贫困户 + /// + [Column("ISPOOR")] + public string IsPoor { get; set; } + /// /// 宿舍号 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs index 5a6792b0f..b8b582b8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs @@ -110,6 +110,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// void SaveEntity(string keyValue, StuInfoFreshEntity entity, List stuInfoFreshEmergePeopleList, List stuInfoFreshFamilyList); + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + void SaveEntity(string keyValue, StuInfoFreshEntity entity); #endregion #region 扩展数据 @@ -129,12 +135,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration void IsCollectFile(string keyValue, string status); /// - /// 领取用品 + /// 领取钥匙 /// 主键 /// /// void IsGetKey(string keyValue, string status); + /// + /// 领取校园卡 + /// 主键 + /// + /// + void IsGetCard(string keyValue, string status); + /// /// 缴费 /// 主键 @@ -142,6 +155,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// void IsPayFee(string keyValue, string status); + /// + /// 其他费用缴费 + /// 主键 + /// + /// + void IsOtherPayFee(string keyValue, string status); + /// /// 分配班级 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index 37ffb8927..b3c3a554f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -839,6 +839,40 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(string keyValue, StuInfoFreshEntity 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 #region 扩展数据 @@ -906,7 +940,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } /// - /// 领取用品 + /// 领取钥匙 /// 主键 /// /// @@ -936,6 +970,37 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 领取校园卡 + /// 主键 + /// + /// + public void IsGetCard(string keyValue, string status) + { + try + { + if (status == "1")//领取 + { + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set GetCardStatus='1',GetCardDate='" + DateTime.Now + "' where ID='" + keyValue + "' "); + } + else + { + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set GetCardStatus='0',GetCardDate=null where ID='" + keyValue + "' "); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 缴费 /// 主键 @@ -967,6 +1032,37 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 其他费用缴费 + /// 主键 + /// + /// + public void IsOtherPayFee(string keyValue, string status) + { + try + { + if (status == "1")//缴费 + { + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set OtherPayFeeStatus='1',OtherPayFeeDate='" + DateTime.Now + "' where ID='" + keyValue + "' "); + } + else + { + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set OtherPayFeeStatus='0',OtherPayFeeDate=null where ID='" + keyValue + "' "); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 分配班级 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs index 078ed25fa..0db9bf5ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs @@ -233,6 +233,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var Sys_SendFile = db.FindEntity(m => m.SProcessId == processId); Sys_SendFile.SendFlag = status; + + //获取校长的审批意见 if (status == 2) { Sys_SendFile.SendTime = DateTime.Now; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs index 47c54edda..9ed676d9b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs @@ -10,9 +10,10 @@ namespace Learun.Application.WorkFlow public class Sys_SendFileMethod : IWorkFlowMethod { Sys_SendFileIBLL asset = new Sys_SendFileBLL(); + NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); public void Sucess(string processId) { - asset.ChangeStatusByProcessId(processId,2); + asset.ChangeStatusByProcessId(processId, 2); } public void Fail(string processId) @@ -25,6 +26,18 @@ namespace Learun.Application.WorkFlow if (parameter.code == "agree") { asset.ChangeStatusByProcessId(parameter.processId, 2); + var list = nWFTaskIBLL.GetLogList(parameter.processId); + var nwfTaskLogEntity = list.FirstOrDefault(a => a.F_TaskUserName == "关亮"); + Sys_SendFileEntity entity = asset.GetEntityByProcessId(parameter.processId); + if (nwfTaskLogEntity != null) + { + entity.SpecifyReceiver = nwfTaskLogEntity.F_Des; + } + else + { + entity.SpecifyReceiver = "测试信息"; + } + asset.SaveEntity(entity.SFileId, entity); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs index 122e727ee..7074c7918 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs @@ -174,6 +174,12 @@ namespace Learun.Application.WorkFlow /// [NotMapped] public int? F_IsUrge { get; set; } + + /// + /// 合同流程专用， 校长是否同意 + /// + [NotMapped] + public bool? LeaderIsAgree { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs index 6fbead2d5..b37a2add6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs @@ -237,6 +237,18 @@ namespace Learun.Application.WorkFlow foreach (var item in aa) { item.F_TaskId = this.BaseRepository().FindEntity(x => x.F_ProcessId == item.F_Id)?.F_Id; + + //合同流程审批专用 如果第一步校长审批同意的话 可以打印授权委托书 + if (item.F_SchemeCode == "LC_Contract_") + { + var entity = this.BaseRepository().FindEntity(a => + a.F_ProcessId == item.F_Id && a.F_TaskUserId == "29add015-3638-415d-9f91-5024bd746fb5" && + a.F_OperationCode == "agree"); + if (null != entity) + { + item.LeaderIsAgree = true; + } + } } return aa; }