diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs index 3583fad19..132cf4cb6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs @@ -91,6 +91,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 毕业归档-设置毕业时间 + /// + /// + [HttpGet] + public ActionResult FinishSchoolDateForm() + { + return View(); + } [HttpGet] public ActionResult CreateGraduateNoForm() { @@ -581,6 +590,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuInfoBasicIBLL.StuStore(); return Success("操作成功"); } + /// + /// 学生毕业归档-设置毕业时间 + /// + /// + /// + [HttpPost] + [AjaxOnly] + + public ActionResult SaveFinishSchoolDate(DateTime finishDate) + { + stuInfoBasicIBLL.SaveFinishSchoolDate(finishDate); + return Success("操作成功"); + } /// /// 删除实体数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs index b5cc372df..a0fe2c5e5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs @@ -80,6 +80,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(stuInfoGraduateEntity); } + /// + /// 毕业流程审核 + /// + /// + [HttpGet] + public ActionResult GraduateCheck() + { + return View(); + } #endregion #region 获取数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.cshtml index e4034cd02..970b52539 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.cshtml @@ -35,7 +35,7 @@
-
准许毕业
+
毕业状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js index 250c1013d..835f5f095 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js @@ -38,11 +38,11 @@ var bootstrap = function ($, learun) { }) } }); - //$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + //$('#ClassNo').lrDataSourceSelect({ code: 'allbjqj', value: 'classno', text: 'classname' }); $('#ClassNo').lrselect({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classname asc" }, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classname asc" }, value: "classno", text: "classname" }); @@ -83,7 +83,7 @@ var bootstrap = function ($, learun) { // 初始化列表 initGird: function () { $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList', headData: [ { label: "学号", name: "StuNo", width: 150, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, @@ -124,7 +124,7 @@ var bootstrap = function ($, learun) { 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', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj', key: value, keyId: 'classno', callback: function (_data) { @@ -165,7 +165,8 @@ var bootstrap = function ($, learun) { mainId: 'StuId', isPage: true, isMultiselect: false, - + sidx: "FinishSchoolMark,StuNo", + sord:"asc" }); page.search(); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FinishSchoolDateForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FinishSchoolDateForm.cshtml new file mode 100644 index 000000000..427d906f7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FinishSchoolDateForm.cshtml @@ -0,0 +1,11 @@ +@{ + ViewBag.Title = "设置毕业时间"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
毕业时间*
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/FinishSchoolDateForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FinishSchoolDateForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FinishSchoolDateForm.js new file mode 100644 index 000000000..925422faf --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FinishSchoolDateForm.js @@ -0,0 +1,31 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2024-03-04 16:53 + * 描 述：设置毕业时间 + */ +var acceptClick; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var finishDate = $('#FinishSchoolDate').val(); + + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/SaveFinishSchoolDate', { finishDate: finishDate }, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); + +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.cshtml index 5998bf8ee..0d86b65ea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.cshtml @@ -37,7 +37,7 @@
-
准许毕业
+
毕业状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js index 6646fe237..dcc5413ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js @@ -38,11 +38,11 @@ var bootstrap = function ($, learun) { }) } }); - //$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + //$('#ClassNo').lrDataSourceSelect({ code: 'allbjqj', value: 'classno', text: 'classname' }); $('#ClassNo').lrselect({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classname asc" }, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classname asc" }, value: "classno", text: "classname" }); @@ -60,8 +60,22 @@ var bootstrap = function ($, learun) { $('#lr_store').on('click', function () { learun.layerConfirm('1.毕业生归档必须在6-8月份进行；
2.归档后的学生信息如：操行、奖惩、成绩、毕业证书等只有通过毕业生信息管理才能查询或打印；
3.毕业学生的账户将自动取消；
4.学生所占的床位也将自动退掉；
5.学生所在的班级置为已毕业班级；
6.归档操作后不可撤消，请谨慎操作！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuStore', {}, function () { - refreshGirdData(); + learun.layerForm({ + id: 'FinishSchoolDateForm', + title: '设置毕业时间', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FinishSchoolDateForm', + width: 400, + height: 400, + callBack: function (id) { + return top[id].acceptClick(function () { + learun.loading(true, "归档中..."); + //归档操作 + learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuStore', {}, function () { + learun.loading(false); + refreshGirdData(); + }); + }); + } }); } }); @@ -111,7 +125,7 @@ var bootstrap = function ($, learun) { 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', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj', key: value, keyId: 'classno', callback: function (_data) { @@ -147,61 +161,13 @@ var bootstrap = function ($, learun) { } }, { label: "毕业时间", name: "FinishSchoolDate", width: 130, align: "left" }, - { - label: "图书资料归还状态", name: "ReturnBooksStatus", width: 120, align: "left", formatter: function (cellvalue) { - return cellvalue == "1" ? "已归还" : "未归还" - } - }, - { label: "图书资料归还时间", name: "ReturnBooksDate", width: 130, align: "left" }, - { - label: "就业协议备案状态", name: "EmployAgreeStatus", width: 120, align: "left", formatter: function (cellvalue) { - return cellvalue == "1" ? "已备案" : "未备案" - } - }, - { label: "就业协议备案时间", name: "EmployAgreeDate", width: 130, align: "left" }, - { - label: "学杂费结算状态", name: "FeeSettleStatus", width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == "1" ? "已结算" : "未结算" - } - }, - { label: "学杂费结算时间", name: "FeeSettleDate", width: 130, align: "left" }, - { - label: "办理退住手续状态", name: "CheckOutStatus", width: 120, align: "left", formatter: function (cellvalue) { - return cellvalue == "1" ? "已办理" : "未办理" - } - }, - { label: "办理退住手续时间", name: "CheckOutDate", width: 130, align: "left" }, - { - label: "校园卡注销状态", name: "CardDeregistrateStatus", width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == "1" ? "已注销" : "未注销" - } - }, - { label: "校园卡注销时间", name: "CardDeregistrateDate", width: 130, align: "left" }, - { - label: "毕业证领取状态", name: "DiplomaReceiveStatus", width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == "1" ? "已领取" : "未领取" - } - }, - { label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 130, align: "left" }, - { - label: "档案转出状态", name: "FileTransferStatus", width: 100, align: "left", - formatter: function (cellvalue) { - return cellvalue == "1" ? "已转出" : "未转出" - } - }, - { label: "档案转出时间", name: "FileTransferDate", width: 130, align: "left" }, - { - label: "组织关系转出状态", name: "TissueStatus", width: 110, align: "left", - formatter: function (cellvalue) { - return cellvalue == "1" ? "已转出" : "未转出" - } - }, - { label: "组织关系转出时间", name: "TissueDate", width: 130, align: "left" } ], mainId: 'StuId', isPage: true, - isMultiselect: true, + isMultiselect: false, rows: 100, + sidx: 'FinishSchoolMark desc', + sord: 'desc' }); page.search(); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml index 16a3279b6..56ecb178b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml @@ -37,7 +37,7 @@
-
准许毕业
+
毕业状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js index 39f8aa099..b6b2c3e05 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js @@ -44,28 +44,28 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + Grades + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -81,32 +81,32 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "majorno='" + MajorNos + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -115,8 +115,8 @@ var bootstrap = function ($, learun) { }); $('#ClassNo').lrselect({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }, value: "classno", text: "classname" }); @@ -133,7 +133,11 @@ var bootstrap = function ($, learun) { $('#lr_cardderegistrate').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var CardDeregistrateStatus = $('#gridtable').jfGridValue('CardDeregistrateStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } if (CardDeregistrateStatus.indexOf('1') != -1) { return learun.alert.warning("选中项包括已注销数据！"); } @@ -150,7 +154,11 @@ var bootstrap = function ($, learun) { $('#lr_cancelcardderegistrate').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var CardDeregistrateStatus = $('#gridtable').jfGridValue('CardDeregistrateStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } for (var i = 0; i < CardDeregistrateStatus.split(',').length; i++) { if (CardDeregistrateStatus.split(',')[i] != 1) { return learun.alert.warning("选中项包括未注销数据！"); @@ -170,7 +178,7 @@ var bootstrap = function ($, learun) { // 初始化列表 initGird: function () { $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList', headData: [ { label: "学号", name: "StuNo", width: 130, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, @@ -210,7 +218,7 @@ var bootstrap = function ($, learun) { 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', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj', key: value, keyId: 'classno', callback: function (_data) { @@ -257,6 +265,8 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, + sidx: "FinishSchoolMark,CardDeregistrateStatus,StuNo", + sord: "asc" }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml index adf92de21..549bd971b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml @@ -37,7 +37,7 @@
-
准许毕业
+
毕业状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js index aec500e18..48c23ea7f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js @@ -44,28 +44,28 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + Grades + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -81,32 +81,32 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "majorno='" + MajorNos + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -115,8 +115,8 @@ var bootstrap = function ($, learun) { }); $('#ClassNo').lrselect({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }, value: "classno", text: "classname" }); @@ -133,7 +133,11 @@ var bootstrap = function ($, learun) { $('#lr_checkout').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var CheckOutStatus = $('#gridtable').jfGridValue('CheckOutStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } if (CheckOutStatus.indexOf('1') != -1) { return learun.alert.warning("选中项包括已办理退住数据！"); } @@ -150,7 +154,11 @@ var bootstrap = function ($, learun) { $('#lr_cancelcheckout').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var CheckOutStatus = $('#gridtable').jfGridValue('CheckOutStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } for (var i = 0; i < CheckOutStatus.split(',').length; i++) { if (CheckOutStatus.split(',')[i] != 1) { return learun.alert.warning("选中项包括未办理退住数据！"); @@ -170,7 +178,7 @@ var bootstrap = function ($, learun) { // 初始化列表 initGird: function () { $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList', headData: [ { label: "学号", name: "StuNo", width: 130, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, @@ -210,7 +218,7 @@ var bootstrap = function ($, learun) { 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', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj', key: value, keyId: 'classno', callback: function (_data) { @@ -257,6 +265,8 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, + sidx: "FinishSchoolMark,CheckOutStatus,StuNo", + sord: "asc" }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml index 154f2ee09..3a655104f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml @@ -37,7 +37,7 @@
-
准许毕业
+
毕业状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js index cb2210ffc..659d1623e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js @@ -44,28 +44,28 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + Grades + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -81,32 +81,32 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "majorno='" + MajorNos + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -115,8 +115,8 @@ var bootstrap = function ($, learun) { }); $('#ClassNo').lrselect({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }, value: "classno", text: "classname" }); @@ -133,7 +133,11 @@ var bootstrap = function ($, learun) { $('#lr_employagree').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var EmployAgreeStatus = $('#gridtable').jfGridValue('EmployAgreeStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } if (EmployAgreeStatus.indexOf('1') != -1) { return learun.alert.warning("选中项包括已备案数据！"); } @@ -150,7 +154,11 @@ var bootstrap = function ($, learun) { $('#lr_cancelemployagree').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var EmployAgreeStatus = $('#gridtable').jfGridValue('EmployAgreeStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } for (var i = 0; i < EmployAgreeStatus.split(',').length; i++) { if (EmployAgreeStatus.split(',')[i] != 1) { return learun.alert.warning("选中项包括未备案数据！"); @@ -170,7 +178,7 @@ var bootstrap = function ($, learun) { // 初始化列表 initGird: function () { $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList', headData: [ { label: "学号", name: "StuNo", width: 130, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, @@ -210,7 +218,7 @@ var bootstrap = function ($, learun) { 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', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj', key: value, keyId: 'classno', callback: function (_data) { @@ -257,7 +265,8 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, - + sidx: "FinishSchoolMark,EmployAgreeStatus,StuNo", + sord: "asc" }); page.search(); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml index 0898bc864..f5a497e1c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml @@ -37,7 +37,7 @@
-
准许毕业
+
毕业状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js index 68664f728..5e48afe71 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js @@ -44,28 +44,28 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + Grades + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -81,32 +81,32 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "majorno='" + MajorNos + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -115,8 +115,8 @@ var bootstrap = function ($, learun) { }); $('#ClassNo').lrselect({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }, value: "classno", text: "classname" }); @@ -133,7 +133,11 @@ var bootstrap = function ($, learun) { $('#lr_feesettle').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var FeeSettleStatus = $('#gridtable').jfGridValue('FeeSettleStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } if (FeeSettleStatus.indexOf('1') != -1) { return learun.alert.warning("选中项包括已结算数据！"); } @@ -150,7 +154,11 @@ var bootstrap = function ($, learun) { $('#lr_cancelfeesettle').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var FeeSettleStatus = $('#gridtable').jfGridValue('FeeSettleStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } for (var i = 0; i < FeeSettleStatus.split(',').length; i++) { if (FeeSettleStatus.split(',')[i] != 1) { return learun.alert.warning("选中项包括未结算数据！"); @@ -170,7 +178,7 @@ var bootstrap = function ($, learun) { // 初始化列表 initGird: function () { $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList', headData: [ { label: "学号", name: "StuNo", width: 130, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, @@ -210,7 +218,7 @@ var bootstrap = function ($, learun) { 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', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj', key: value, keyId: 'classno', callback: function (_data) { @@ -257,7 +265,8 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, - + sidx: "FinishSchoolMark,FeeSettleStatus,StuNo", + sord: "asc" }); page.search(); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml index fa996b4f3..01262f931 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml @@ -37,7 +37,7 @@
-
准许毕业
+
毕业状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js index c72ab983f..94747a23d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js @@ -44,28 +44,28 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + Grades + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -81,32 +81,32 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "majorno='" + MajorNos + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } else { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" } }); } } @@ -115,8 +115,8 @@ var bootstrap = function ($, learun) { }); $('#ClassNo').lrselect({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }, value: "classno", text: "classname" }); @@ -133,7 +133,11 @@ var bootstrap = function ($, learun) { $('#lr_returnbooks').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var ReturnBooksStatus = $('#gridtable').jfGridValue('ReturnBooksStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } if (ReturnBooksStatus.indexOf('1') != -1) { return learun.alert.warning("选中项包括已归还数据！"); } @@ -150,7 +154,11 @@ var bootstrap = function ($, learun) { $('#lr_cancelreturnbooks').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); var ReturnBooksStatus = $('#gridtable').jfGridValue('ReturnBooksStatus'); + var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (FinishSchoolMark.indexOf('2') != -1) { + return learun.alert.warning("选中项包括已毕业数据，无法操作！"); + } for (var i = 0; i < ReturnBooksStatus.split(',').length; i++) { if (ReturnBooksStatus.split(',')[i] != 1) { return learun.alert.warning("选中项包括未归还数据！"); @@ -170,7 +178,7 @@ var bootstrap = function ($, learun) { // 初始化列表 initGird: function () { $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList', headData: [ { label: "学号", name: "StuNo", width: 130, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, @@ -210,7 +218,7 @@ var bootstrap = function ($, learun) { 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', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj', key: value, keyId: 'classno', callback: function (_data) { @@ -257,6 +265,8 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, + sidx: "FinishSchoolMark,ReturnBooksStatus,StuNo", + sord: "asc" }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/GraduateCheck.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/GraduateCheck.cshtml new file mode 100644 index 000000000..671f97424 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/GraduateCheck.cshtml @@ -0,0 +1,60 @@ +@{ + /**/ + + ViewBag.Title = "毕业流程审核"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
学号
+ +
+
+
姓名
+ +
+
+
年级
+ +
+
+
系部
+
+
+
+
专业
+
+
+
+
班级
+
+
+
+
毕业状态
+
+
+
+
+
+
+
+
+ +
+
+  审核 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoGraduate/GraduateCheck.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/GraduateCheck.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/GraduateCheck.js new file mode 100644 index 000000000..e4a0e56e6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/GraduateCheck.js @@ -0,0 +1,219 @@ +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); + }, 290, 400); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + var deptno = ""; + if (val) { + deptno = val.deptno; + } + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + text: "MajorName", + value: "MajorNo" + }) + } + }); + $('#MajorNo').lrDataSourceSelect({ + code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: + function (val) { + var majorNo = ''; + if (val) { + majorNo = val.MajorNo; + } + var nj = $('#Grade').val(); + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo + '&nj=' + nj, + text: "ClassName", + value: "ClassNo" + }) + } + }); + //$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + $('#ClassNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classname asc" }, + value: "classno", + text: "classname" + }); + $('#FinishSchoolMark').lrselect({ + data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }], + text: "text", + value: "value" + }) + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + + //归档 + $('#lr_check').on('click', function () { + return false; + + learun.layerConfirm('1.毕业生归档必须在6-8月份进行；
2.归档后的学生信息如：操行、奖惩、成绩、毕业证书等只有通过毕业生信息管理才能查询或打印；
3.毕业学生的账户将自动取消；
4.学生所占的床位也将自动退掉；
5.学生所在的班级置为已毕业班级；
6.归档操作后不可撤消，请谨慎操作！', function (res) { + if (res) { + learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuStore', {}, function () { + refreshGirdData(); + }); + } + }); + }) + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList', + headData: [ + { label: "学号", name: "StuNo", width: 130, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "性别", name: "GenderNo", width: 50, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { + 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: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { label: "年级", name: "Grade", width: 50, align: "left" }, + { + label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "毕业证书号", name: "DiplomaNo", width: 100, align: "left" }, + { + label: '毕业状态', name: 'FinishSchoolMark', width: 100, align: "left", formatter: function (val) { + if (val == '0') { + return '待准许'; + } else if (val == "1") { + return '准许毕业'; + } else if (val == '2') { + return '已毕业'; + } else { + return '待准许'; + } + } + }, + { label: "毕业时间", name: "FinishSchoolDate", width: 130, align: "left" }, + { + label: "图书资料归还状态", name: "ReturnBooksStatus", width: 120, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已归还" : "未归还" + } + }, + { label: "图书资料归还时间", name: "ReturnBooksDate", width: 130, align: "left" }, + { + label: "就业协议备案状态", name: "EmployAgreeStatus", width: 120, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已备案" : "未备案" + } + }, + { label: "就业协议备案时间", name: "EmployAgreeDate", width: 130, align: "left" }, + { + label: "学杂费结算状态", name: "FeeSettleStatus", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已结算" : "未结算" + } + }, + { label: "学杂费结算时间", name: "FeeSettleDate", width: 130, align: "left" }, + { + label: "办理退住手续状态", name: "CheckOutStatus", width: 120, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已办理" : "未办理" + } + }, + { label: "办理退住手续时间", name: "CheckOutDate", width: 130, align: "left" }, + { + label: "校园卡注销状态", name: "CardDeregistrateStatus", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已注销" : "未注销" + } + }, + { label: "校园卡注销时间", name: "CardDeregistrateDate", width: 130, align: "left" }, + { + label: "毕业证领取状态", name: "DiplomaReceiveStatus", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "已领取" : "未领取" + } + }, + { label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 130, align: "left" }, + { + label: "档案转出状态", name: "FileTransferStatus", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == "1" ? "已转出" : "未转出" + } + }, + { label: "档案转出时间", name: "FileTransferDate", width: 130, align: "left" }, + { + label: "组织关系转出状态", name: "TissueStatus", width: 110, align: "left", + formatter: function (cellvalue) { + return cellvalue == "1" ? "已转出" : "未转出" + } + }, + { label: "组织关系转出时间", name: "TissueDate", width: 130, align: "left" } + ], + mainId: 'StuId', + isPage: true, + isMultiselect: true, + rows: 100, + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#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/StuScore/ScoreQueryAllIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml index 28b6eccd5..91a3433aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml @@ -108,7 +108,7 @@
 准许毕业 -  不准毕业 + @* 不准毕业*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js index 3477d82e8..8f91497e0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js @@ -43,7 +43,12 @@ var bootstrap = function ($, learun) { $('#lr_allowGraduate').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuNo'); var stuName = $('#gridtable').jfGridValue('StuName'); + var finishMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (finishMark.indexOf("1") != -1 || finishMark.indexOf("2") != -1) { + learun.alert.warning("选中项包含准许毕业或已毕业的学生！"); + return false; + } learun.layerConfirm('是否准许 ' + stuName + ' 毕业？', function (res) { if (res) { learun.getForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate?stuNo=' + keyValue +'&status=1', function () { @@ -112,8 +117,8 @@ var bootstrap = function ($, learun) { //}); $('#ClassNo').lrselect({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classname asc" }, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classname asc" }, value: "classno", text: "classname", select: function (val) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml index 54a820a3d..a902e3104 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml @@ -102,7 +102,7 @@
 准许毕业 -  不准毕业 + @* 不准毕业*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js index c6df00e6d..684129453 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js @@ -64,7 +64,12 @@ var bootstrap = function ($, learun) { $('#lr_allowGraduate').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuNo'); var stuName = $('#gridtable').jfGridValue('StuName'); + var finishMark = $('#gridtable').jfGridValue('FinishSchoolMark'); if (learun.checkrow(keyValue)) { + if (finishMark.indexOf("1") != -1 || finishMark.indexOf("2") != -1) { + learun.alert.warning("选中项包含准许毕业或已毕业的学生！"); + return false; + } learun.layerConfirm('是否准许 ' + stuName + ' 毕业？', function (res) { if (res) { learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '1' }, function () { 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 1a9f67f8b..e748c3032 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 @@ -1230,6 +1230,7 @@ + @@ -1350,6 +1351,7 @@ + @@ -1359,6 +1361,7 @@ + @@ -8128,6 +8131,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs index 757edd3f2..d86d9dbc4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs @@ -377,7 +377,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - return this.BaseRepository("CollegeMIS").FindList(m => m.CheckMark == true && m.MajorNo == MajorNo && (nj == "" || m.ClassName.StartsWith(nj))).OrderBy(x => x.ClassName); + return this.BaseRepository("CollegeMIS").FindList(m => (m.CheckMark == true || (m.CheckMark == false && m.ClassStatus == "1")) && m.MajorNo == MajorNo && (nj == "" || m.ClassName.StartsWith(nj))).OrderBy(x => x.ClassName); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs index 80dad882d..75808a774 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs @@ -111,7 +111,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } /// - /// 获取StuInfoBasic表实体数据 + /// 生成毕业证号 /// 主键 /// /// @@ -642,6 +642,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + /// + /// 学生毕业归档-设置毕业时间 + /// + /// + public void SaveFinishSchoolDate(DateTime finishDate) + { + try + { + stuInfoBasicService.SaveFinishSchoolDate(finishDate); + } + 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/StuInfoBasic/StuInfoBasicIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs index e65eecf88..2a25d1ea4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs @@ -1,6 +1,7 @@ using Learun.Util; using System.Data; using System.Collections.Generic; +using System; namespace Learun.Application.TwoDevelopment.EducationalAdministration { @@ -31,7 +32,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration void CreateGraduateNoByMajor(string CityCode, string SchoolCode, string MajorList); /// - /// 获取StuInfoBasic表实体数据 + /// 生成毕业证号 /// 主键 /// /// @@ -100,6 +101,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// void IsFileTransfer(string keyValue, string status, string fort); void StuStore(); + /// + /// 学生毕业归档-设置毕业时间 + /// + /// + void SaveFinishSchoolDate(DateTime finishDate); /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index f414dcaff..d0605e108 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -431,7 +431,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } /// - /// 获取StuInfoBasic表实体数据 + /// 生成毕业证号 /// 主键 /// /// @@ -448,14 +448,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var numberCode = 1; //获取最大的序号 - var DiplomaNoList = this.BaseRepository("CollegeMIS").FindList(x => x.DiplomaNo.Contains(year + schoolCode)).Select(x => x.DiplomaNo).ToList(); + var DiplomaNoList = this.BaseRepository("CollegeMIS").FindList(x => x.DiplomaNo.Contains(year + schoolCode)).Select(x => x.DiplomaNo).ToList(); if (DiplomaNoList.Any()) { numberCode = DiplomaNoList.Max(x => x).Substring(12, 4).ToInt() + 1; } - //获取所有要毕业的学生按年级查询出来，再按学号进行由小到大排序， - var stuList = this.BaseRepository("CollegeMIS").FindList(x => (x.FinishSchoolMark == "1" || x.FinishSchoolMark == "2") && (x.DiplomaNo == null || x.DiplomaNo == "")).OrderBy(x => x.Grade).ThenBy(x => x.StuNo); + //获取毕业表中的学生按年级查询出来，再按学号进行由小到大排序， + var stuList = this.BaseRepository("CollegeMIS").FindList(x => (x.FinishSchoolMark == "1" || x.FinishSchoolMark == "2") && (x.DiplomaNo == null || x.DiplomaNo == "")).OrderBy(x => x.Grade).ThenBy(x => x.StuNo); foreach (var item in stuList) { item.DiplomaNo = year + schoolCode + numberCode.ToString().PadLeft(4, '0'); @@ -571,23 +571,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (status == "1")//准许毕业 { - //判断离校手续是否全办完，若满足则修改毕业状态为已毕业和毕业时间，若不满足则修改毕业状态为准许毕业； - foreach (var item in stuNo.Split(',')) - { - var itementity = db.FindEntity(x => x.StuNo == item); - if (itementity.FinishSchoolMark == "1" || itementity.FinishSchoolMark == "2") - { - throw new ArgumentException("所选数据中有已操作完成的数据，无需重复操作"); - } - else if (itementity.ReturnBooksStatus == "1" && itementity.EmployAgreeStatus == "1" && itementity.FeeSettleStatus == "1" && itementity.CheckOutStatus == "1" && itementity.CardDeregistrateStatus == "1" && itementity.DiplomaReceiveStatus == "1" && itementity.FileTransferStatus == "1") - { - db.ExecuteBySql($"UPDATE dbo.StuInfoBasic SET FinishSchoolMark ='2',FinishSchoolDate='" + DateTime.Now + "' WHERE StuNo='" + item + "' "); - } - else - { - db.ExecuteBySql($"UPDATE dbo.StuInfoBasic SET FinishSchoolMark ='{status}',FinishSchoolDate=null WHERE StuNo='" + item + "' "); - } - } + db.ExecuteBySql($"UPDATE dbo.StuInfoBasic SET FinishSchoolMark ='{status}',FinishSchoolDate=null WHERE StuNo in({stulist}) "); } else//不准毕业 { @@ -604,7 +588,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { throw; } - else if(ex is ArgumentException) + else if (ex is ArgumentException) { throw; } @@ -836,12 +820,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET ReturnBooksStatus='{status}',ReturnBooksDate='{now}' WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET ReturnBooksStatus='{status}',ReturnBooksDate='{now}' WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间； - var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1' "; - db.ExecuteBySql(sql2); } } else @@ -850,12 +830,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET ReturnBooksStatus='{status}',ReturnBooksDate=null WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET ReturnBooksStatus='{status}',ReturnBooksDate=null WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空； - var sql2 = $"UPDATE StuInfoBasic SET FinishSchoolMark='1',FinishSchoolDate=null WHERE StuId='{item}' and FinishSchoolMark='2' "; - db.ExecuteBySql(sql2); } } @@ -890,12 +866,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET EmployAgreeStatus='{status}',EmployAgreeDate='{now}' WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET EmployAgreeStatus='{status}',EmployAgreeDate='{now}' WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间； - var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1' "; - db.ExecuteBySql(sql2); } } else @@ -904,12 +876,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET EmployAgreeStatus='{status}',EmployAgreeDate=null WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET EmployAgreeStatus='{status}',EmployAgreeDate=null WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空； - var sql2 = $"UPDATE StuInfoBasic SET FinishSchoolMark='1',FinishSchoolDate=null WHERE StuId='{item}' and FinishSchoolMark='2' "; - db.ExecuteBySql(sql2); } } @@ -944,12 +912,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET FeeSettleStatus='{status}',FeeSettleDate='{now}' WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET FeeSettleStatus='{status}',FeeSettleDate='{now}' WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间； - var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1' "; - db.ExecuteBySql(sql2); } } else @@ -958,12 +922,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET FeeSettleStatus='{status}',FeeSettleDate=null WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET FeeSettleStatus='{status}',FeeSettleDate=null WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空； - var sql2 = $"UPDATE StuInfoBasic SET FinishSchoolMark='1',FinishSchoolDate=null WHERE StuId='{item}' and FinishSchoolMark='2' "; - db.ExecuteBySql(sql2); } } @@ -998,12 +958,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET CheckOutStatus='{status}',CheckOutDate='{now}' WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET CheckOutStatus='{status}',CheckOutDate='{now}' WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间； - var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1' "; - db.ExecuteBySql(sql2); } } else @@ -1012,12 +968,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET CheckOutStatus='{status}',CheckOutDate=null WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET CheckOutStatus='{status}',CheckOutDate=null WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空； - var sql2 = $"UPDATE StuInfoBasic SET FinishSchoolMark='1',FinishSchoolDate=null WHERE StuId='{item}' and FinishSchoolMark='2' "; - db.ExecuteBySql(sql2); } } @@ -1052,12 +1004,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET CardDeregistrateStatus='{status}',CardDeregistrateDate='{now}' WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET CardDeregistrateStatus='{status}',CardDeregistrateDate='{now}' WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间； - var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1' "; - db.ExecuteBySql(sql2); } } else @@ -1066,12 +1014,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var keyValueArr = keyValue.Split(','); foreach (var item in keyValueArr) { - var sql = $"UPDATE StuInfoBasic SET CardDeregistrateStatus='{status}',CardDeregistrateDate=null WHERE StuId='{item}'"; + var sql = $"UPDATE StuInfoGraduate SET CardDeregistrateStatus='{status}',CardDeregistrateDate=null WHERE StuId='{item}'"; db.ExecuteBySql(sql); - - //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空； - var sql2 = $"UPDATE StuInfoBasic SET FinishSchoolMark='1',FinishSchoolDate=null WHERE StuId='{item}' and FinishSchoolMark='2' "; - db.ExecuteBySql(sql2); } } @@ -1189,28 +1133,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var adb = this.BaseRepository().BeginTrans(); try { - //归档前提为毕业标志为2(已毕业)的学生 - var stuInfos = db.FindList(a => a.FinishSchoolMark == "2"); + //归档前提为毕业标志为1(准许毕业)的学生 + var stuInfos = db.FindList(a => a.FinishSchoolMark == "1"); foreach (var item in stuInfos) { - //var StuInfoType = typeof(StuInfoBasicEntity); - //var PropertyInfoStuInfo = StuInfoType.GetProperties(); - //var GraduateEntity = new StuInfoGraduateEntity(); - //var typegraduate = typeof(StuInfoGraduateEntity); - //var PropertyInfoGraduate = typegraduate.GetProperties(); - //foreach (var itemStuInfo in PropertyInfoStuInfo) - //{ - // var objStuInfoType = itemStuInfo.GetValue(StuInfoType); - // foreach (var itemGraduate in PropertyInfoGraduate) - // { - // if (itemGraduate.Name == itemStuInfo.Name) - // { - // itemGraduate.SetValue(GraduateEntity, objStuInfoType, null); - // } - // } - - //} - var accountInfo = adb.FindEntity(a => a.F_Account == item.StuNo); if (accountInfo != null) { @@ -1242,12 +1168,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration classInfo.ClassStatus = "1"; db.Update(classInfo); } - //删除学籍表信息 - db.Delete(item); //增加学生毕业表信息 var addSql = $"insert into StuInfoGraduate select * from StuInfoBasic where StuId='{item.StuId}'"; db.ExecuteBySql(addSql); - //db.Insert(GraduateEntity); + //删除学籍表信息 + db.Delete(item); } db.Commit(); adb.Commit(); @@ -1266,6 +1191,36 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + /// + /// 学生毕业归档-设置毕业时间 + /// + /// + public void SaveFinishSchoolDate(DateTime finishDate) + { + try + { + //前提为毕业标志为1(准许毕业)的学生 + var stuInfos = this.BaseRepository("CollegeMIS").FindList(a => a.FinishSchoolMark == "1"); + if (stuInfos.Any()) + { + var stuIds = stuInfos.Select(x => "'" + x.StuId + "'").ToArray(); + var stuIdStr = string.Join(",", stuIds); + this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuInfoBasic set FinishSchoolDate='{finishDate}' where StuId in ({stuIdStr}) "); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 保存实体数据（新增、修改） @@ -1817,8 +1772,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration switch (type) { case 2: - rs = query.Join(this.BaseRepository("CollegeMIS").FindList(),a=>a.DeptNo,b=>b.DeptNo,(a,b)=>new { b.DeptName}).GroupBy(x => x.DeptName).ToDictionary(x=>x.Key,a=>a.Count()); - + rs = query.Join(this.BaseRepository("CollegeMIS").FindList(), a => a.DeptNo, b => b.DeptNo, (a, b) => new { b.DeptName }).GroupBy(x => x.DeptName).ToDictionary(x => x.Key, a => a.Count()); + break; default: rs = query.GroupBy(x => x.GenderNo ?? false).ToDictionary(x => x.Key ? "男" : "女", a => a.Count());