+
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 413dbe927..8f5d48af5 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
@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
});
$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
$('#FinishSchoolMark').lrselect({
- data: [{ text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
+ data: [{ text: "已毕业", value: "2" },{ text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
text: "text",
value: "value"
})
@@ -47,26 +47,16 @@ var bootstrap = function ($, learun) {
$('#lr_refresh').on('click', function () {
location.reload();
});
- $('#lr_getcard').on('click', function () {
- var keyValue = $('#gridtable').jfGridValue('StuId');
- if (learun.checkrow(keyValue)) {
- learun.layerConfirm('是否确认领取毕业证！', function (res) {
- if (res) {
- learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue }, function () {
- refreshGirdData();
- });
- }
- });
- }
- })
+
+ //归档
$('#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', { keyValue: keyValue }, function () {
- refreshGirdData();
- });
- }
- });
+ learun.layerConfirm('1.毕业生归档必须在6-8月份进行；
2.归档后的学生信息如：操行、奖惩、成绩、毕业证书等只有通过毕业生信息管理才能查询或打印；
3.毕业学生的账户将自动取消；
4.学生所占的床位也将自动退掉；
5.学生所在的班级置为已毕业班级；
6.归档操作后不可撤消，请谨慎操作！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuStore', { }, function () {
+ refreshGirdData();
+ });
+ }
+ });
})
},
@@ -75,10 +65,10 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
headData: [
- { label: "学号", name: "StuNo", width: 100, align: "left" },
+ { label: "学号", name: "StuNo", width: 130, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
- label: "性别", name: "GenderNo", width: 80, align: "left",
+ label: "性别", name: "GenderNo", width: 50, align: "left",
formatter: function (cellvalue) {
return cellvalue == true ? "男" : "女";
}
@@ -122,7 +112,7 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "年级", name: "Grade", width: 100, align: "left" },
+ { 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', {
@@ -134,6 +124,7 @@ var bootstrap = function ($, learun) {
});
}
},
+ { label: "毕业证书号", name: "DiplomaNo", width: 100, align: "left" },
{
label: '毕业状态', name: 'FinishSchoolMark', width: 100, align: "left", formatter: function (val) {
if (val == '0') {
@@ -141,15 +132,55 @@ var bootstrap = function ($, learun) {
} else if (val == "1") {
return '准许毕业';
} else if (val == '2') {
-
return '已毕业';
} else {
return '待准许';
}
}
},
- { label: "毕业证", name: "DiplomaNo", width: 100, align: "left" },
- { label: "毕业时间", name: "FinishSchoolDate", width: 100, align: "left" },
+ { 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: 150, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "1" ? "已转出" : "未转出"
+ }
+ },
+ { label: "档案与组织关系转出时间", name: "FileTransferDate", width: 150, align: "left" },
],
mainId: 'StuId',
isPage: true,
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
new file mode 100644
index 000000000..ebc438e07
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml
@@ -0,0 +1,61 @@
+@{
+ /**/
+
+ ViewBag.Title = "学生学籍";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js")
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
new file mode 100644
index 000000000..079b81dbe
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js
@@ -0,0 +1,180 @@
+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;
+ }
+ $('#ClassNo').lrselectRefresh({
+ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
+ text: "ClassName",
+ value: "ClassNo"
+ })
+ }
+ });
+ $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', 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_cardderegistrate').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认注销校园卡！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue,status:'1' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+ //取消校园卡注销
+ $('#lr_cancelcardderegistrate').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认取消注销校园卡！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '0' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/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: "CardDeregistrateStatus", width: 100, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "1" ? "已注销" : "未注销"
+ }
+ },
+ { label: "校园卡注销时间", name: "CardDeregistrateDate", width: 100, align: "left" },
+ ],
+ mainId: 'StuId',
+ isPage: true,
+ isMultiselect: true,
+
+ });
+ 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/StuInfoBasic/GraduateCheckOut.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml
new file mode 100644
index 000000000..d5440339d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml
@@ -0,0 +1,61 @@
+@{
+ /**/
+
+ ViewBag.Title = "学生学籍";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js")
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
new file mode 100644
index 000000000..746f451bb
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js
@@ -0,0 +1,180 @@
+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;
+ }
+ $('#ClassNo').lrselectRefresh({
+ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
+ text: "ClassName",
+ value: "ClassNo"
+ })
+ }
+ });
+ $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', 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_checkout').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认办理退住手续！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue,status:'1' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+ //取消办理退住手续
+ $('#lr_cancelcheckout').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认取消办理退住手续！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '0' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/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: "CheckOutStatus", width: 120, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "1" ? "已办理" : "未办理"
+ }
+ },
+ { label: "办理退住手续时间", name: "CheckOutDate", width: 100, align: "left" },
+ ],
+ mainId: 'StuId',
+ isPage: true,
+ isMultiselect: true,
+
+ });
+ 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/StuInfoBasic/GraduateDiplomaReceive.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml
new file mode 100644
index 000000000..ae8aeee06
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml
@@ -0,0 +1,61 @@
+@{
+ /**/
+
+ ViewBag.Title = "学生学籍";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js
new file mode 100644
index 000000000..7a34e3943
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js
@@ -0,0 +1,179 @@
+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;
+ }
+ $('#ClassNo').lrselectRefresh({
+ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
+ text: "ClassName",
+ value: "ClassNo"
+ })
+ }
+ });
+ $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', 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_getcard').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认领取毕业证！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue,status:'1' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+ //取消毕业证领取
+ $('#lr_cancelgetcard').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认取消领取毕业证！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '0' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/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: "DiplomaReceiveStatus", width: 100, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "1" ? "已领取" : "未领取"
+ }
+ },
+ { label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 100, align: "left" },
+ ],
+ mainId: 'StuId',
+ isPage: true,
+ isMultiselect: true,
+
+ });
+ 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/StuInfoBasic/GraduateEmployAgree.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml
new file mode 100644
index 000000000..263c095e3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml
@@ -0,0 +1,61 @@
+@{
+ /**/
+
+ ViewBag.Title = "学生学籍";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js")
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
new file mode 100644
index 000000000..9a8ca60f9
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js
@@ -0,0 +1,180 @@
+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;
+ }
+ $('#ClassNo').lrselectRefresh({
+ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
+ text: "ClassName",
+ value: "ClassNo"
+ })
+ }
+ });
+ $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', 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_employagree').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认备案就业协议！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue,status:'1' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+ //取消就业协议备案
+ $('#lr_cancelemployagree').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认取消备案就业协议！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '0' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/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: "EmployAgreeStatus", width: 120, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "1" ? "已备案" : "未备案"
+ }
+ },
+ { label: "就业协议备案时间", name: "EmployAgreeDate", width: 100, align: "left" },
+ ],
+ mainId: 'StuId',
+ isPage: true,
+ isMultiselect: true,
+
+ });
+ 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/StuInfoBasic/GraduateFeeSettle.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml
new file mode 100644
index 000000000..63b5ff185
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml
@@ -0,0 +1,61 @@
+@{
+ /**/
+
+ ViewBag.Title = "学生学籍";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js")
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
new file mode 100644
index 000000000..9245bdf6e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js
@@ -0,0 +1,180 @@
+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;
+ }
+ $('#ClassNo').lrselectRefresh({
+ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
+ text: "ClassName",
+ value: "ClassNo"
+ })
+ }
+ });
+ $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', 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_feesettle').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认结算学杂费！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue,status:'1' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+ //取消学杂费结算
+ $('#lr_cancelfeesettle').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认取消结算学杂费！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '0' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/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: "FeeSettleStatus", width: 100, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "1" ? "已结算" : "未结算"
+ }
+ },
+ { label: "学杂费结算时间", name: "FeeSettleDate", width: 100, align: "left" },
+ ],
+ mainId: 'StuId',
+ isPage: true,
+ isMultiselect: true,
+
+ });
+ 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/StuInfoBasic/GraduateFileTransfer.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml
new file mode 100644
index 000000000..b12072bc7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml
@@ -0,0 +1,61 @@
+@{
+ /**/
+
+ ViewBag.Title = "学生学籍";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js
new file mode 100644
index 000000000..c4933c84c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js
@@ -0,0 +1,180 @@
+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;
+ }
+ $('#ClassNo').lrselectRefresh({
+ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
+ text: "ClassName",
+ value: "ClassNo"
+ })
+ }
+ });
+ $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', 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_filetransfer').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认转出档案与组织关系！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue,status:'1' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+ //取消档案与组织关系转出
+ $('#lr_cancelfiletransfer').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认取消转出档案与组织关系！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/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: "FileTransferStatus", width: 150, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "1" ? "已转出" : "未转出"
+ }
+ },
+ { label: "档案与组织关系转出时间", name: "FileTransferDate", width: 100, align: "left" },
+ ],
+ mainId: 'StuId',
+ isPage: true,
+ isMultiselect: true,
+
+ });
+ 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/StuInfoBasic/GraduateReturnBooks.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml
new file mode 100644
index 000000000..3ed8a1682
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml
@@ -0,0 +1,61 @@
+@{
+ /**/
+
+ ViewBag.Title = "学生学籍";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js")
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
new file mode 100644
index 000000000..5c369d8e1
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js
@@ -0,0 +1,180 @@
+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;
+ }
+ $('#ClassNo').lrselectRefresh({
+ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
+ text: "ClassName",
+ value: "ClassNo"
+ })
+ }
+ });
+ $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', 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_returnbooks').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认归还图书资料！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue,status:'1' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+ //取消图书资料归还
+ $('#lr_cancelreturnbooks').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('StuId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认取消归还图书资料！', function (res) {
+ if (res) {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ })
+
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/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: 100, align: "left" },
+ ],
+ mainId: 'StuId',
+ isPage: true,
+ isMultiselect: true,
+
+ });
+ 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/StuInfoGraduate/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.cshtml
index 5a64cb1d4..a9e045c36 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.cshtml
@@ -10,14 +10,6 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js
index 47e23c1fa..1ca659c35 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js
@@ -9,10 +9,66 @@ var bootstrap = function ($, learun) {
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
- }, 220, 400);
- $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
- $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
- $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+ }, 300, 400);
+ $('#DeptNo').lrselect({
+ allowSearch: true,
+ value: "deptno",
+ text: "deptname",
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+ select: function (item) {
+ if (item) {
+ $('#MajorNo').lrselectRefresh({
+ allowSearch: true,
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+ param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+ });
+ } else {
+ $('#MajorNo').lrselectRefresh({
+ allowSearch: true,
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+ param: { strWhere: "1=1 AND CheckMark=1" }
+ });
+ }
+
+ }
+ });
+ $('#MajorNo').lrselect({
+ allowSearch: true,
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+ value: "majorno",
+ text: "majorname",
+ param: { strWhere: "1=1 AND CheckMark=1" },
+ select: function (item) {
+ if (item) {
+ $('#ClassNo').lrselectRefresh({
+ allowSearch: true,
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+ param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
+ });
+ } else {
+ $('#ClassNo').lrselectRefresh({
+ allowSearch: true,
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+ param: { strWhere: "1=1 AND CheckMark=1" }
+ });
+ }
+ }
+ });
+ $('#ClassNo').lrselect({
+ allowSearch: true,
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+ param: { strWhere: "1=1 AND CheckMark=1" },
+ value: "classno",
+ text: "classname"
+ });
+ $('#Grade').lrselect({
+ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+ value: "value",
+ text: "text",
+ });
+ $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
+ $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
+ $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -22,11 +78,18 @@ var bootstrap = function ($, learun) {
},
// 初始化列表
initGird: function () {
- $('#gridtable').lrAuthorizeJfGrid({
+ $('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList',
headData: [
- { label: "学号", name: "StuNo", width: 100, align: "left" },
+ {
+ label: "审核状态", name: "CheckMark", width: 80, align: "center",
+ formatter: function (cellvalue) {
+ return cellvalue == "1" ? "
已审核" : "
未审核";
+ }
+ },
+ { label: "学生编号", name: "StuNo", width: 100, align: "left" },
{ label: "学籍号", name: "StuCode", width: 100, align: "left" },
+ { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -34,7 +97,12 @@ var bootstrap = function ($, learun) {
return cellvalue == true ? "男" : "女";
}
},
- { label: "出生日期", name: "Birthday", width: 100, align: "left" },
+ {
+ label: "出生日期", name: "Birthday", width: 100, align: "left",
+ formatter: function (value) {
+ return learun.formatDate(value, 'yyyy-MM-dd');
+ }
+ },
{ label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
{
label: "民族", name: "NationalityNo", width: 100, align: "left",
@@ -48,6 +116,19 @@ var bootstrap = function ($, learun) {
});
}
},
+ {
+ label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'PolityStatus',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "年级", name: "Grade", width: 100, align: "left" },
{
label: "系所", name: "DeptNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -87,7 +168,6 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "年级", name: "Grade", width: 100, align: "left" },
{
label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
@@ -122,21 +202,323 @@ var bootstrap = function ($, learun) {
}
},
{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
+ { label: "入学方式", name: "EntranceWay", width: 100, align: "left" },
{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
{ label: "余额", name: "Balance", width: 100, align: "left" },
- { label: "通信地址", name: "MailAddress", width: 100, align: "left" },
+ { label: "家庭地址", name: "MailAddress", width: 100, align: "left" },
+ { label: "联系电话", name: "mobile", width: 100, align: "left" },
+ { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
+ { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
{
- label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
- formatter: function (cellvalue) {
- return cellvalue == "1" ? "
" : "
";
+ label: "五年一贯制", name: "FiveYear", width: 100, align: "left"
+ , formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'PieceCultivateWay',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
}
},
+ //{
+ // label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
+ // formatter: function (cellvalue) {
+ // return cellvalue == "1" ? "
" : "
";
+ // }
+ //},
{
- label: "审核状态", name: "CheckMark", width: 80, align: "center",
+ label: "是否上传头像", name: "Photo", width: 80, align: "center",
formatter: function (cellvalue) {
- return cellvalue == "1" ? "
已审核" : "
未审核";
+ if (cellvalue != null && cellvalue != "" && cellvalue != undefined) {
+ return cellvalue = "
是";
+ } else {
+ return cellvalue = "
否";
+ }
}
- }
+ },
+ { label: "拼音", name: "SpellFull", width: 100, align: "left", ishide: true },
+ { label: "就读方式", name: "StudyingWay", width: 100, align: "left", ishide: true },
+ {
+ label: "国籍", name: "CountryNo", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'BCdCountry',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: "港澳台侨外", name: "OverseasChineseNo", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'BCdOverseasChinese',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: "婚姻状况", name: "MarriageStatus", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'BCdOverseasChinese',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true, },
+ { label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left", ishide: true, },
+ { label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left", ishide: true, },
+ { label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left", ishide: true, },
+ { label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left", ishide: true, },
+ { label: "所属派出所", name: "BelongPolice", width: 100, align: "left", ishide: true, },
+ { label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left", ishide: true, },
+ { label: "是否农户", name: "ResidenceNo", width: 100, align: "left", ishide: true, },
+ {
+ label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'StuLivePlaceType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'StuHealthType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "学生来源", name: "StuOrigin", width: 100, align: "left", ishide: true, },
+ { label: "招生对象", name: "RecruitObject", width: 100, align: "left", ishide: true, },
+ { label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left", ishide: true, },
+ {
+ label: "招生方式", name: "RecruitWay", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'RecruitWay',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'RecruitCooperateType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "准考证号", name: "AdmissionNo", width: 100, align: "left", ishide: true, },
+ { label: "考生号", name: "ksh", width: 100, align: "left", ishide: true, },
+ { label: "考试总分", name: "ExamScore", width: 100, align: "left", ishide: true, },
+ { label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left", ishide: true, },
+ { label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left", ishide: true, },
+ { label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left", ishide: true, },
+ { label: "英文姓名", name: "EnglishName", width: 100, align: "left", ishide: true, },
+ { label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left", ishide: true, },
+ { label: "其他联系方式", name: "OtherContact", width: 100, align: "left", ishide: true, },
+ { label: "成员1姓名", name: "OneName", width: 100, align: "left", ishide: true, },
+ { label: "成员1联系电话", name: "OneMobile", width: 100, align: "left", ishide: true },
+ {
+ label: "成员1关系", name: "OneMembership", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'GuardianType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left", ishide: true, },
+ {
+ label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left", ishide: true,
+ formatter: function (value) {
+ return learun.formatDate(value, 'yyyy-MM-dd');
+ }
+ },
+ {
+ label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'IdCardType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left", ishide: true, },
+ {
+ label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'National',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'EpiHealth',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left", ishide: true, },
+ { label: "成员2姓名", name: "TwoName", width: 100, align: "left", ishide: true, },
+ { label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left", ishide: true },
+ {
+ label: "成员2关系", name: "TwoMembership", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'GuardianType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left", ishide: true, },
+ {
+ label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left", ishide: true,
+ formatter: function (value) {
+ return learun.formatDate(value, 'yyyy-MM-dd');
+ }
+ },
+ {
+ label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'IdCardType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left", ishide: true, },
+ {
+ label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'National',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ {
+ label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", ishide: true,
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'EpiHealth',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left", ishide: true, },
+ { label: "成员2职务", name: "TwoPosition", width: 100, align: "left", ishide: true, },
+ { 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: 150, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "1" ? "已转出" : "未转出"
+ }
+ },
+ { label: "档案与组织关系转出时间", name: "FileTransferDate", width: 150, align: "left" },
],
mainId: 'StuId',
isPage: true,
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 b733415fb..5b6d436d5 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
@@ -138,6 +138,7 @@ var bootstrap = function ($, learun) {
}
},
{ label: '是否有补考', name: 'IsNoPass', width: 100, align: "left" },
+ { label: '由系统判定学生毕业项目达标的状态', name: 'GraduateStandardStateBySystem', width: 100, align: "left" },
];
$("#gridtable")[0].dfop = undefined;
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 964daad61..92b875035 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
@@ -1106,6 +1106,13 @@
+
+
+
+
+
+
+
@@ -1121,6 +1128,13 @@
+
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs
index 939f8b7b5..cf4a69230 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs
@@ -92,7 +92,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
public bool? SyncFlag { get; set; }
///
- /// 班级状态
+ /// 班级类型
///
[Column("CLASSTYPE")]
public string ClassType { get; set; }
@@ -101,6 +101,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("ISSEPARATE")]
public bool? IsSeparate { get; set; }
+
+ ///
+ /// 班级状态（0未毕业班级，1已毕业班级）
+ ///
+ [Column("CLASSSTATUS")]
+ public string ClassStatus { get; set; }
#endregion
#region 扩展操作
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 075c1741e..4f50bb79e 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
@@ -381,11 +381,149 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
主键
///
///
- public void GetCard(string keyValue)
+ public void GetCard(string keyValue,string status)
{
try
{
- stuInfoBasicService.GetCard(keyValue);
+ stuInfoBasicService.GetCard(keyValue,status);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 图书资料归还
+ /// 主键
+ ///
+ ///
+ public void IsReturnBooks(string keyValue, string status)
+ {
+ try
+ {
+ stuInfoBasicService.IsReturnBooks(keyValue, status);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 就业协议备案
+ /// 主键
+ ///
+ ///
+ public void IsEmployAgree(string keyValue, string status)
+ {
+ try
+ {
+ stuInfoBasicService.IsEmployAgree(keyValue, status);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 学杂费结算
+ /// 主键
+ ///
+ ///
+ public void IsFeeSettle(string keyValue, string status)
+ {
+ try
+ {
+ stuInfoBasicService.IsFeeSettle(keyValue, status);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 办理退住手续
+ /// 主键
+ ///
+ ///
+ public void IsCheckOut(string keyValue, string status)
+ {
+ try
+ {
+ stuInfoBasicService.IsCheckOut(keyValue, status);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 校园卡注销
+ /// 主键
+ ///
+ ///
+ public void IsCardDeregistrate(string keyValue, string status)
+ {
+ try
+ {
+ stuInfoBasicService.IsCardDeregistrate(keyValue, status);
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+ ///
+ /// 档案与组织关系转出
+ /// 主键
+ ///
+ ///
+ public void IsFileTransfer(string keyValue, string status)
+ {
+ try
+ {
+ stuInfoBasicService.IsFileTransfer(keyValue, status);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
index 9204370c9..fa19beea7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
@@ -297,7 +297,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("STUNOCHANGEMARK")]
public string StuNoChangeMark { get; set; }
///
- /// 毕业标志
+ /// 毕业标志（0待准许，1准许毕业，2已毕业，）
///
[Column("FINISHSCHOOLMARK")]
public string FinishSchoolMark { get; set; }
@@ -799,6 +799,91 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("TWOMOBILE")]
public string TwoMobile { get; set; }
+
+ ///
+ /// 图书资料归还状态
+ ///
+ ///
+ [Column("RETURNBOOKSSTATUS")]
+ public string ReturnBooksStatus { get; set; }
+ ///
+ /// 图书资料归还时间
+ ///
+ ///
+ [Column("RETURNBOOKSDATE")]
+ public DateTime? ReturnBooksDate { get; set; }
+ ///
+ /// 就业协议备案状态
+ ///
+ ///
+ [Column("EMPLOYAGREESTATUS")]
+ public string EmployAgreeStatus { get; set; }
+ ///
+ /// 就业协议备案时间
+ ///
+ ///
+ [Column("EMPLOYAGREEDATE")]
+ public DateTime? EmployAgreeDate { get; set; }
+ ///
+ /// 学杂费结算状态
+ ///
+ ///
+ [Column("FEESETTLESTATUS")]
+ public string FeeSettleStatus { get; set; }
+ ///
+ /// 学杂费结算时间
+ ///
+ ///
+ [Column("FEESETTLEDATE")]
+ public DateTime? FeeSettleDate { get; set; }
+ ///
+ /// 办理退住手续状态
+ ///
+ ///
+ [Column("CHECKOUTSTATUS")]
+ public string CheckOutStatus { get; set; }
+ ///
+ /// 办理退住手续时间
+ ///
+ ///
+ [Column("CHECKOUTDATE")]
+ public DateTime? CheckOutDate { get; set; }
+ ///
+ /// 校园卡注销状态
+ ///
+ ///
+ [Column("CARDDEREGISTRATESTATUS")]
+ public string CardDeregistrateStatus { get; set; }
+ ///
+ /// 校园卡注销时间
+ ///
+ ///
+ [Column("CARDDEREGISTRATEDATE")]
+ public DateTime? CardDeregistrateDate { get; set; }
+ ///
+ /// 毕业证领取状态
+ ///
+ ///
+ [Column("DIPLOMARECEIVESTATUS")]
+ public string DiplomaReceiveStatus { get; set; }
+ ///
+ /// 毕业证领取时间
+ ///
+ ///
+ [Column("DIPLOMARECEIVEDATE")]
+ public DateTime? DiplomaReceiveDate { get; set; }
+ ///
+ /// 档案与组织关系转出状态
+ ///
+ ///
+ [Column("FILETRANSFERSTATUS")]
+ public string FileTransferStatus { get; set; }
+ ///
+ /// 档案与组织关系转出状态时间
+ ///
+ ///
+ [Column("FILETRANSFERDATE")]
+ public DateTime? FileTransferDate { get; set; }
#endregion
#region 扩展操作
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 960ca58f8..0c334a7bd 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
@@ -59,7 +59,37 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 领取毕业证
///
///
- void GetCard(string keyValue);
+ void GetCard(string keyValue,string status);
+ ///
+ /// 图书资料归还
+ ///
+ ///
+ void IsReturnBooks(string keyValue, string status);
+ ///
+ /// 就业协议备案
+ ///
+ ///
+ void IsEmployAgree(string keyValue, string status);
+ ///
+ /// 学杂费结算
+ ///
+ ///
+ void IsFeeSettle(string keyValue, string status);
+ ///
+ /// 办理退住手续
+ ///
+ ///
+ void IsCheckOut(string keyValue, string status);
+ ///
+ /// 校园卡注销
+ ///
+ ///
+ void IsCardDeregistrate(string keyValue, string status);
+ ///
+ /// 档案与组织关系转出
+ ///
+ ///
+ void IsFileTransfer(string keyValue, string status);
void StuStore();
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 8fa00c304..09bbd3eda 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
@@ -512,18 +512,364 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 主键
///
///
- public void GetCard(string keyValue)
+ public void GetCard(string keyValue,string status)
{
var db = this.BaseRepository("CollegeMIS").BeginTrans();
try
{
+ if (status == "1")//领取
+ {
+ var now = DateTime.Now;
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate='{now}' WHERE StuId='{item}'";
+ db.ExecuteBySql(sql);
- var keyValueArr = keyValue.Split(',');
- foreach (var item in keyValueArr)
+ //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
+ 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 CardDeregistrateStatus='1' and FileTransferStatus='1' ";
+ db.ExecuteBySql(sql2);
+ }
+ }
+ else
+ {
+
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate=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);
+ }
+ }
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ /// 图书资料归还
+ /// 主键
+ ///
+ ///
+ public void IsReturnBooks(string keyValue, string status)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ if (status == "1")//归还
+ {
+ var now = DateTime.Now;
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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' ";
+ db.ExecuteBySql(sql2);
+ }
+ }
+ else
+ {
+
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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);
+ }
+ }
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ /// 就业协议备案
+ /// 主键
+ ///
+ ///
+ public void IsEmployAgree(string keyValue, string status)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ if (status == "1")//备案
+ {
+ var now = DateTime.Now;
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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' ";
+ db.ExecuteBySql(sql2);
+ }
+ }
+ else
+ {
+
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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);
+ }
+ }
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ /// 学杂费结算
+ /// 主键
+ ///
+ ///
+ public void IsFeeSettle(string keyValue, string status)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ if (status == "1")//结算
+ {
+ var now = DateTime.Now;
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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' ";
+ db.ExecuteBySql(sql2);
+ }
+ }
+ else
+ {
+
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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);
+ }
+ }
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ /// 办理退住手续
+ /// 主键
+ ///
+ ///
+ public void IsCheckOut(string keyValue, string status)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ if (status == "1")//办理
+ {
+ var now = DateTime.Now;
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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' ";
+ db.ExecuteBySql(sql2);
+ }
+ }
+ else
{
- var sql = $"UPDATE dbo.StuInfoBasic SET FinishSchoolMark='2',FinishSchoolDate=GETDATE() WHERE StuId='{item}'";
- db.ExecuteBySql(sql);
+
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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);
+ }
}
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ /// 校园卡注销
+ /// 主键
+ ///
+ ///
+ public void IsCardDeregistrate(string keyValue, string status)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ if (status == "1")//注销
+ {
+ var now = DateTime.Now;
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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' ";
+ db.ExecuteBySql(sql2);
+ }
+ }
+ else
+ {
+
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic 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);
+ }
+ }
+
+ db.Commit();
+ }
+ catch (Exception ex)
+ {
+ db.Rollback();
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+ ///
+ /// 档案与组织关系转出
+ /// 主键
+ ///
+ ///
+ public void IsFileTransfer(string keyValue, string status)
+ {
+ var db = this.BaseRepository("CollegeMIS").BeginTrans();
+ try
+ {
+ if (status == "1")//转出
+ {
+ var now = DateTime.Now;
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic SET FileTransferStatus='{status}',FileTransferDate='{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 CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' ";
+ db.ExecuteBySql(sql2);
+ }
+ }
+ else
+ {
+
+ var keyValueArr = keyValue.Split(',');
+ foreach (var item in keyValueArr)
+ {
+ var sql = $"UPDATE StuInfoBasic SET FileTransferStatus='{status}',FileTransferDate=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);
+ }
+ }
+
db.Commit();
}
catch (Exception ex)
@@ -545,32 +891,40 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
public void StuStore()
{
+ /*
+ 1.毕业生归档必须在6-8月份进行；
+ 2.归档后的学生信息如：操行、奖惩、成绩、毕业证书等只有通过毕业生信息管理才能查询或打印；
+ 3.毕业学生的账户将自动取消；
+ 4.学生所占的床位也将自动退掉；
+ 5.学生所在的班级置为已毕业班级；
+ 6.归档操作后不可撤消，请谨慎操作！
+ */
+
var db = this.BaseRepository("CollegeMIS").BeginTrans();
var adb = this.BaseRepository().BeginTrans();
try
{
- //归档前提为已经领取毕业证的学生
- var stuInfos = db
- .FindList(a => a.FinishSchoolMark == "2");
+ //归档前提为毕业标志为2(已毕业)的学生
+ var stuInfos = db.FindList(a => a.FinishSchoolMark == "2");
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 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)
@@ -579,17 +933,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
adb.Delete(accountInfo);
}
//清空宿舍信息
- var dormitory = db
- .FindEntity(a => a.StudentID == item.StuId);
+ var dormitory = db.FindEntity(a => a.StudentID == item.StuId);
if (dormitory != null)
{
dormitory.StudentID = "";
dormitory.StuName = "";
db.Update(dormitory);
}
+ //班级置为已毕业班级
+ var classInfo = db.FindEntity(x => x.ClassNo == item.ClassNo);
+ if (classInfo != null && classInfo.ClassStatus != "1")
+ {
+ classInfo.ClassStatus = "1";
+ db.Update(classInfo);
+ }
+ //删除学籍表信息
db.Delete(item);
- db.Insert(GraduateEntity);
+ //增加学生毕业表信息
+ var addSql = $"insert into StuInfoGraduate select * from StuInfoBasic where StuId='{item.StuId}'";
+ db.ExecuteBySql(addSql);
+ //db.Insert(GraduateEntity);
}
+ db.Commit();
+ adb.Commit();
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs
index a2c02cada..b74538d33 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs
@@ -13,535 +13,877 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
public class StuInfoGraduateEntity
{
+
#region 实体成员
+
///
- /// StuId
+ /// 学校编号
///
- ///
- [Column("STUID")]
- public string StuId { get; set; }
+ [Column("F_SCHOOLID")]
+ public string F_SchoolId { get; set; }
+
///
/// 学号
///
- ///
[Column("STUNO")]
public string StuNo { get; set; }
+
///
/// 学籍号
///
- ///
[Column("STUCODE")]
public string StuCode { get; set; }
///
/// 通知书号
///
- ///
[Column("NOTICENO")]
public string NoticeNo { get; set; }
///
- /// 毕业日期
+ /// GraduateYear
///
- ///
[Column("GRADUATEYEAR")]
public string GraduateYear { get; set; }
///
/// 考生号
///
- ///
[Column("KSH")]
public string ksh { get; set; }
///
- /// 系所
+ /// 系所代码
///
- ///
[Column("DEPTNO")]
public string DeptNo { get; set; }
///
- /// 专业
+ /// 专业代码
///
- ///
[Column("MAJORNO")]
public string MajorNo { get; set; }
///
+ /// 专业方向号（如0，1，2，3，4，5）
+ ///代表无专业方向细分
+ ///
+ [Column("MAJORDETAILNO")]
+ public string MajorDetailNo { get; set; }
+ ///
+ /// 专业方向名
+ ///
+ [Column("MAJORDETAILNAME")]
+ public string MajorDetailName { get; set; }
+ ///
+ /// 专业拼音全称
+ ///
+ [Column("MAJORDETAILSPELL")]
+ public string MajorDetailSpell { get; set; }
+ ///
/// 年级
///
- ///
[Column("GRADE")]
public string Grade { get; set; }
///
- /// 班级
+ /// 行政班号
///
- ///
[Column("CLASSNO")]
public string ClassNo { get; set; }
///
/// 姓名
///
- ///
[Column("STUNAME")]
public string StuName { get; set; }
///
/// 拼音全称
///
- ///
[Column("SPELLFULL")]
public string SpellFull { get; set; }
///
/// 拼音简称
///
- ///
[Column("SPELLBRIEF")]
public string SpellBrief { get; set; }
///
- /// 性别
+ /// 性别码
///
- ///
[Column("GENDERNO")]
public bool? GenderNo { get; set; }
///
/// 出生日期
///
- ///
[Column("BIRTHDAY")]
public DateTime? Birthday { get; set; }
///
- /// 政治面貌
+ /// 政治面貌码
///
- ///
[Column("PARTYFACENO")]
public string PartyFaceNo { get; set; }
///
/// 家庭出身份
///
- ///
[Column("FAMILYORIGINNO")]
public string FamilyOriginNo { get; set; }
///
- /// 民族
+ /// 民族码
///
- ///
[Column("NATIONALITYNO")]
public string NationalityNo { get; set; }
///
- /// 省
+ /// 籍贯省代码 废除
///
- ///
[Column("PROVINCENO")]
public string ProvinceNo { get; set; }
///
+ /// 籍贯省代码代码
+ ///
+ [Column("F_PROVINCEID")]
+ public string F_ProvinceId { get; set; }
+ ///
+ /// 籍贯市代码
+ ///
+ [Column("F_CITYID")]
+ public string F_CityId { get; set; }
+
+ ///
+ /// 籍贯县代码
+ ///
+ [Column("F_COUNTYID")]
+ public string F_CountyId { get; set; }
+ ///
/// 籍贯
///
- ///
[Column("REGIONNO")]
public string RegionNo { get; set; }
///
/// 农业户口（是否农户）
///
- ///
[Column("RESIDENCENO")]
public string ResidenceNo { get; set; }
///
/// 考生类别
///
- ///
[Column("TESTSTUSORTNO")]
public string TestStuSortNo { get; set; }
///
/// 健康状况
///
- ///
[Column("HEALTHSTATUSNO")]
public string HealthStatusNo { get; set; }
///
/// 第几志愿
///
- ///
[Column("WILLNO")]
public string WillNo { get; set; }
///
/// TestStuSubjectNo
///
- ///
[Column("TESTSTUSUBJECTNO")]
public string TestStuSubjectNo { get; set; }
///
/// 本专科
///
- ///
[Column("GRADUATENO")]
public string GraduateNo { get; set; }
///
/// 计划形式
///
- ///
[Column("PLANFORMNO")]
public string PlanFormNo { get; set; }
///
/// 三好
///
- ///
[Column("ISTHREEGOOD")]
public string IsThreeGood { get; set; }
///
/// 优干
///
- ///
[Column("ISEXCELLENT")]
public string IsExcellent { get; set; }
///
/// 一般学生干部
///
- ///
[Column("ISNORMALCADRE")]
public string IsNormalCadre { get; set; }
///
/// 省市前三
///
- ///
[Column("ISPROVINCEFIRSTTHREE")]
public string IsProvinceFirstThree { get; set; }
///
/// 港澳台侨
///
- ///
[Column("OVERSEASCHINESENO")]
public string OverseasChineseNo { get; set; }
///
/// 录取类别
///
- ///
[Column("MATRICULATESORT")]
public string MatriculateSort { get; set; }
///
/// 来源地区码
///
- ///
[Column("COMEPROVINCENO")]
public string ComeProvinceNo { get; set; }
///
/// 原单位码
///
- ///
[Column("HIGHSCHOOLNO")]
public string HighSchoolNo { get; set; }
///
/// 原单位
///
- ///
[Column("HIGHSCHOOLNAME")]
public string HighSchoolName { get; set; }
///
/// 入学年月
///
- ///
[Column("ENTRANCEDATE")]
public DateTime? EntranceDate { get; set; }
///
/// 宗教
///
- ///
[Column("RELIGION")]
public string Religion { get; set; }
///
/// 特长
///
- ///
[Column("GOODAT")]
public string GoodAt { get; set; }
///
/// 身份证号
///
- ///
[Column("IDENTITYCARDNO")]
public string IdentityCardNo { get; set; }
///
/// 入党时间
///
- ///
[Column("JOINPARTYDATE")]
public DateTime? JoinPartyDate { get; set; }
///
- /// 入团时间
+ /// 入团时间
+ ///团员league
///
- ///
[Column("JOINLEAGUEDATE")]
public DateTime? JoinLeagueDate { get; set; }
///
/// 校内地址
///
- ///
[Column("INSCHOOLADDRESS")]
public string InSchoolAddress { get; set; }
///
/// 校内电话
///
- ///
[Column("INSCHOOLTELEPHONE")]
public string InSchoolTelephone { get; set; }
///
- /// 异动标志
+ /// 当前异动类别
///
- ///
[Column("ABMORMITYMOVEMARK")]
public string AbmormityMoveMark { get; set; }
///
/// 奖励标志
///
- ///
[Column("AWARDMARK")]
public string AwardMark { get; set; }
///
/// 处分标志
///
- ///
[Column("PUNISHMARK")]
public string PunishMark { get; set; }
///
/// 联系人标志
///
- ///
[Column("LINKMANMARK")]
public string LinkmanMark { get; set; }
///
/// 学号异动标志
///
- ///
[Column("STUNOCHANGEMARK")]
public string StuNoChangeMark { get; set; }
///
- /// 毕业标志
+ /// 毕业标志（0待准许，1准许毕业，2已毕业，）
///
- ///
[Column("FINISHSCHOOLMARK")]
public string FinishSchoolMark { get; set; }
///
/// 当前注册标志
///
- ///
[Column("CURRENTREGISTERMARK")]
public string CurrentRegisterMark { get; set; }
///
/// 毕业年月
///
- ///
[Column("FINISHSCHOOLDATE")]
public DateTime? FinishSchoolDate { get; set; }
///
/// 毕业证书号
///
- ///
[Column("DIPLOMANO")]
public string DiplomaNo { get; set; }
///
/// 毕业证书备注
///
- ///
[Column("DIPLOMAREMARK")]
public string DiplomaRemark { get; set; }
///
/// 备注
///
- ///
[Column("REMARK")]
public string Remark { get; set; }
///
+ /// 报到日期
+ ///
+ [Column("REGISTERDATE")]
+ public DateTime? RegisterDate { get; set; }
+ ///
/// Photo
///
- ///
[Column("PHOTO")]
public string Photo { get; set; }
///
/// TeachPlanNo
///
- ///
[Column("TEACHPLANNO")]
public string TeachPlanNo { get; set; }
///
- /// 审核标志
+ /// 审查标志
///
- ///
[Column("CHECKMARK")]
public string CheckMark { get; set; }
///
- /// 联系电话
+ /// 联系电话（手机）
///
- ///
[Column("MOBILE")]
public string mobile { get; set; }
///
- /// 电子邮件
+ /// 电子邮件地址
///
- ///
[Column("EMAIL")]
public string EMail { get; set; }
///
- /// QQ
+ ///QQ
///
- ///
[Column("QQ")]
public string QQ { get; set; }
///
/// 户口所在地
///
- ///
[Column("FATHERUNIT")]
public string FatherUnit { get; set; }
///
/// 父亲姓名
///
- ///
[Column("FATHERNAME")]
public string FatherName { get; set; }
///
/// 父亲电话
///
- ///
[Column("FATHERPHONE")]
public string FatherPhone { get; set; }
///
/// 母亲姓名
///
- ///
[Column("MATHERNAME")]
public string MatherName { get; set; }
///
/// 档案所在地
///
- ///
[Column("MATHERUNIT")]
public string MatherUnit { get; set; }
///
/// 母亲电话
///
- ///
[Column("MATHERPHONE")]
public string MatherPhone { get; set; }
///
/// 用户名
///
- ///
[Column("USERNAME")]
public string username { get; set; }
///
/// 密码
///
- ///
[Column("PASSWORD")]
public string password { get; set; }
///
- /// 通信地址
+ /// MailAddress收件人名址（收件人地址+ 姓名,可置默认值为家庭地址）
///
- ///
[Column("MAILADDRESS")]
public string MailAddress { get; set; }
///
- /// 邮政编码
+ /// PostalCode邮政编码
///
- ///
[Column("POSTALCODE")]
public string PostalCode { get; set; }
///
/// InSchoolStatus
///
- ///
[Column("INSCHOOLSTATUS")]
public string InSchoolStatus { get; set; }
///
/// TransMark
///
- ///
[Column("TRANSMARK")]
public string TransMark { get; set; }
///
/// ClassTutorNo
///
- ///
[Column("CLASSTUTORNO")]
public string ClassTutorNo { get; set; }
///
/// 学籍卡审核
///
- ///
[Column("RESUMECHECK")]
public string ResumeCheck { get; set; }
///
/// PracStatus
///
- ///
[Column("PRACSTATUS")]
public string PracStatus { get; set; }
///
/// RegisterStatus
///
- ///
[Column("REGISTERSTATUS")]
public int? RegisterStatus { get; set; }
///
/// PunishmentDate
///
- ///
[Column("PUNISHMENTDATE")]
public DateTime? PunishmentDate { get; set; }
///
- /// 市
- ///
- ///
- [Column("F_CITYID")]
- public string F_CityId { get; set; }
- ///
- /// 县区
- ///
- ///
- [Column("F_COUNTYID")]
- public string F_CountyId { get; set; }
- ///
- /// 省
- ///
- ///
- [Column("F_PROVINCEID")]
- public string F_ProvinceId { get; set; }
- ///
- /// 学校
+ /// StuId
///
- ///
- [Column("F_SCHOOLID")]
- public string F_SchoolId { get; set; }
+ [Column("STUID")]
+ public string StuId { get; set; }
+
///
/// 学制
///
- ///
[Column("EDUSYSTEM")]
public string EduSystem { get; set; }
+
///
/// 学习形式
///
- ///
[Column("STUDYMODALITY")]
public string StudyModality { get; set; }
///
- /// SyncFlag
- ///
- ///
- [Column("SYNCFLAG")]
- public bool? SyncFlag { get; set; }
- ///
/// 学籍异动状态
///
///
[Column("CHANGESTATUS")]
public int? ChangeStatus { get; set; }
///
- /// Balance
+ /// SyncFlag
+ ///
+ [Column("SYNCFLAG")]
+ public bool? SyncFlag { get; set; }
+
+ ///
+ /// 余额
///
- ///
[Column("BALANCE")]
public string Balance { get; set; }
+
///
- /// HealthStatus
+ /// 身体健康状况
///
- ///
[Column("HEALTHSTATUS")]
public string HealthStatus { get; set; }
+
+
+ ///
+ /// 身份证件类型
+ ///
+ [Column("IDCARDTYPE")]
+ public string IdCardType { get; set; }
+ ///
+ /// 入学方式
+ ///
+ [Column("ENTRANCEWAY")]
+ public string EntranceWay { get; set; }
+ ///
+ /// 就读方式
+ ///
+ [Column("STUDYINGWAY")]
+ public string StudyingWay { get; set; }
+ ///
+ /// 国籍/地区
+ ///
+ [Column("COUNTRYNO")]
+ public string CountryNo { get; set; }
+ ///
+ /// 婚姻状况
+ ///
+ [Column("MARRIAGESTATUS")]
+ public string MarriageStatus { get; set; }
+ ///
+ /// 乘火车区间
+ ///
+ [Column("TRAININTERVAL")]
+ public string TrainInterval { get; set; }
+ ///
+ /// 是否随迁子女
+ ///
+ [Column("ISTRAILCHILDREN")]
+ public string IsTrailChildren { get; set; }
+ ///
+ /// 生源地行政区划码
+ ///
+ [Column("STUPLACECODE")]
+ public string StuPlaceCode { get; set; }
+ ///
+ /// 出生地行政区划码
+ ///
+ [Column("BIRTHPLACECODE")]
+ public string BirthPlaceCode { get; set; }
+ ///
+ /// 籍贯地行政区划码
+ ///
+ [Column("NATIVEPLACECODE")]
+ public string NativePlaceCode { get; set; }
+ ///
+ /// 户口所在地行政区划码
+ ///
+ [Column("RESIDENCEPLACECODE")]
+ public string ResidencePlaceCode { get; set; }
+ ///
+ /// 所属派出所
+ ///
+ [Column("BELONGPOLICE")]
+ public string BelongPolice { get; set; }
+ ///
+ /// 学生居住地类型
+ ///
+ [Column("STULIVEPLACETYPE")]
+ public string StuLivePlaceType { get; set; }
+ ///
+ /// 学生来源
+ ///
+ [Column("STUORIGIN")]
+ public string StuOrigin { get; set; }
+ ///
+ /// 招生对象
+ ///
+ [Column("RECRUITOBJECT")]
+ public string RecruitObject { get; set; }
+ ///
+ /// 贫困户否建档立卡贫困户
+ ///
+ [Column("POORISRECORD")]
+ public string PoorIsRecord { get; set; }
+ ///
+ /// 招生方式
+ ///
+ [Column("RECRUITWAY")]
+ public string RecruitWay { get; set; }
+ ///
+ /// 联招合作类型
+ ///
+ [Column("RECRUITCOOPERATETYPE")]
+ public string RecruitCooperateType { get; set; }
+ ///
+ /// 准考证号
+ ///
+ [Column("ADMISSIONNO")]
+ public string AdmissionNo { get; set; }
+ ///
+ /// 考试总分
+ ///
+ [Column("EXAMSCORE")]
+ public decimal? ExamScore { get; set; }
+ ///
+ /// 联招合作办学形式
+ ///
+ [Column("RECRUITCOOPERATEFORM")]
+ public string RecruitCooperateForm { get; set; }
+ ///
+ /// 联招合作学校代码
+ ///
+ [Column("RECRUITCOOPERATESCHOOLNO")]
+ public string RecruitCooperateSchoolNo { get; set; }
+ ///
+ /// 校外教学点
+ ///
+ [Column("SCHOOLOUTSIDEPLACE")]
+ public string SchoolOutsidePlace { get; set; }
+ ///
+ /// 分段培养方式
+ ///
+ [Column("PIECECULTIVATEWAY")]
+ public string PieceCultivateWay { get; set; }
+ ///
+ /// 英文姓名
+ ///
+ [Column("ENGLISHNAME")]
+ public string EnglishName { get; set; }
+ ///
+ /// 成员1关系
+ ///
+ [Column("ONEMEMBERSHIP")]
+ public string OneMembership { get; set; }
+ ///
+ /// 成员1是否监护人
+ ///
+ [Column("ONEISGUARDIAN")]
+ public string OneIsGuardian { get; set; }
+ ///
+ /// 成员1出生年月
+ ///
+ [Column("ONEBIRTHDAY")]
+ public string OneBirthday { get; set; }
+ ///
+ /// 成员1身份证件类型
+ ///
+ [Column("ONEIDCARDTYPE")]
+ public string OneIdCardType { get; set; }
+ ///
+ /// 成员1身份证件号
+ ///
+ [Column("ONEIDCARDNO")]
+ public string OneIdCardNo { get; set; }
+ ///
+ /// 成员1民族
+ ///
+ [Column("ONENATIONALITYNO")]
+ public string OneNationalityNo { get; set; }
+ ///
+ /// 成员1政治面貌
+ ///
+ [Column("ONEPARTYFACENO")]
+ public string OnePartyFaceNo { get; set; }
+ ///
+ /// 成员1健康状况
+ ///
+ [Column("ONEHEALTHSTATUS")]
+ public string OneHealthStatus { get; set; }
+ ///
+ /// 成员1工作或学习单位
+ ///
+ [Column("ONEJOB")]
+ public string OneJob { get; set; }
+ ///
+ /// 成员1职务
+ ///
+ [Column("ONEPOSITION")]
+ public string OnePosition { get; set; }
+ ///
+ /// 成员2关系
+ ///
+ [Column("TWOMEMBERSHIP")]
+ public string TwoMembership { get; set; }
+ ///
+ /// 成员2是否监护人
+ ///
+ [Column("TWOISGUARDIAN")]
+ public string TwoIsGuardian { get; set; }
+ ///
+ /// 成员2出生年月
+ ///
+ [Column("TWOBIRTHDAY")]
+ public string TwoBirthday { get; set; }
+ ///
+ /// 成员2身份证件类型
+ ///
+ [Column("TWOIDCARDTYPE")]
+ public string TwoIdCardType { get; set; }
+ ///
+ /// 成员2身份证件号
+ ///
+ [Column("TWOIDCARDNO")]
+ public string TwoIdCardNo { get; set; }
+ ///
+ /// 成员2民族
+ ///
+ [Column("TWONATIONALITYNO")]
+ public string TwoNationalityNo { get; set; }
+ ///
+ /// 成员2政治面貌
+ ///
+ [Column("TWOPARTYFACENO")]
+ public string TwoPartyFaceNo { get; set; }
+ ///
+ /// 成员2健康状况
+ ///
+ [Column("TWOHEALTHSTATUS")]
+ public string TwoHealthStatus { get; set; }
+ ///
+ /// 成员2工作或学习单位
+ ///
+ [Column("TWOJOB")]
+ public string TwoJob { get; set; }
+ ///
+ /// 成员2职务
+ ///
+ [Column("TWOPOSITION")]
+ public string TwoPosition { get; set; }
+ ///
+ /// 学号
+ ///
+ [Column("PROVINCECODE")]
+ public string ProvinceCode { get; set; }
+ ///
+ /// 监护人
+ ///
+ [Column("GUARDIAN")]
+ public string Guardian { get; set; }
+ ///
+ /// 监护人电话
+ ///
+ [Column("GUARDIANPHONE")]
+ public string GuardianPhone { get; set; }
+ ///
+ /// 监护人与被监护人的关系
+ ///
+ [Column("GUARDIANTYPE")]
+ public string GuardianType { get; set; }
+ ///
+ /// 单亲
+ ///
+ [Column("ISSINGLE")]
+ public bool? IsSingle { get; set; }
+ ///
+ /// 留守
+ ///
+ [Column("ISLEFT")]
+ public bool? IsLeft { get; set; }
+ ///
+ /// 残疾
+ ///
+ [Column("ISDISABILITY")]
+ public bool? IsDisability { get; set; }
+ ///
+ /// 走读
+ ///
+ [Column("ISRUNSCHOOL")]
+ public bool? IsRunSchool { get; set; }
+ ///
+ /// 困难
+ ///
+ [Column("ISDDIFFICULTY")]
+ public bool? IsDdifficulty { get; set; }
+ ///
+ /// 五年一贯制
+ ///
+ [Column("FiveYear")]
+ public string FiveYear { get; set; }
+ ///
+ /// 实习状态
+ ///
+ [Column("INTERNSHIPSTATUS")]
+ public string InternshipStatus { get; set; }
+ ///
+ /// 是否复读
+ ///
+ [Column("ISRESTUDY")]
+ public string IsRestudy { get; set; }
+
+ ///
+ /// 成员1名称
+ ///
+ [Column("OneName")]
+ public string OneName { get; set; }
+ ///
+ /// 成员2名称
+ ///
+ [Column("TWONAME")]
+ public string TwoName { get; set; }
+ ///
+ /// 其他联系方式
+ ///
+ [Column("OTHERCONTACT")]
+ public string OtherContact { get; set; }
+ ///
+ /// 成员1联系方式
+ ///
+ [Column("ONEMOBILE")]
+ public string OneMobile { get; set; }
+ ///
+ /// 成员2联系方式
+ ///
+ [Column("TWOMOBILE")]
+ public string TwoMobile { get; set; }
+
+ ///
+ /// 图书资料归还状态
+ ///
+ ///
+ [Column("RETURNBOOKSSTATUS")]
+ public string ReturnBooksStatus { get; set; }
+ ///
+ /// 图书资料归还时间
+ ///
+ ///
+ [Column("RETURNBOOKSDATE")]
+ public DateTime? ReturnBooksDate { get; set; }
+ ///
+ /// 就业协议备案状态
+ ///
+ ///
+ [Column("EMPLOYAGREESTATUS")]
+ public string EmployAgreeStatus { get; set; }
+ ///
+ /// 就业协议备案时间
+ ///
+ ///
+ [Column("EMPLOYAGREEDATE")]
+ public DateTime? EmployAgreeDate { get; set; }
+ ///
+ /// 学杂费结算状态
+ ///
+ ///
+ [Column("FEESETTLESTATUS")]
+ public string FeeSettleStatus { get; set; }
+ ///
+ /// 学杂费结算时间
+ ///
+ ///
+ [Column("FEESETTLEDATE")]
+ public DateTime? FeeSettleDate { get; set; }
+ ///
+ /// 办理退住手续状态
+ ///
+ ///
+ [Column("CHECKOUTSTATUS")]
+ public string CheckOutStatus { get; set; }
+ ///
+ /// 办理退住手续时间
+ ///
+ ///
+ [Column("CHECKOUTDATE")]
+ public DateTime? CheckOutDate { get; set; }
+ ///
+ /// 校园卡注销状态
+ ///
+ ///
+ [Column("CARDDEREGISTRATESTATUS")]
+ public string CardDeregistrateStatus { get; set; }
+ ///
+ /// 校园卡注销时间
+ ///
+ ///
+ [Column("CARDDEREGISTRATEDATE")]
+ public DateTime? CardDeregistrateDate { get; set; }
+ ///
+ /// 毕业证领取状态
+ ///
+ ///
+ [Column("DIPLOMARECEIVESTATUS")]
+ public string DiplomaReceiveStatus { get; set; }
+ ///
+ /// 毕业证领取时间
+ ///
+ ///
+ [Column("DIPLOMARECEIVEDATE")]
+ public DateTime? DiplomaReceiveDate { get; set; }
+ ///
+ /// 档案与组织关系转出状态
+ ///
+ ///
+ [Column("FILETRANSFERSTATUS")]
+ public string FileTransferStatus { get; set; }
+ ///
+ /// 档案与组织关系转出状态时间
+ ///
+ ///
+ [Column("FILETRANSFERDATE")]
+ public DateTime? FileTransferDate { get; set; }
#endregion
#region 扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateService.cs
index 4fdf27840..cb6ec3611 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateService.cs
@@ -159,9 +159,74 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT ");
- strSql.Append(fieldSql);
+ strSql.Append("SELECT t.* ");
strSql.Append(" FROM StuInfoGraduate t ");
+ strSql.Append(" WHERE 1=1 ");
+ var queryParam = queryJson.ToJObject();
+ // 虚拟参数
+ var dp = new DynamicParameters(new { });
+ if (!queryParam["StuNo"].IsEmpty())
+ {
+ dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+ strSql.Append(" AND t.StuNo = @StuNo ");
+ }
+ if (!queryParam["StuName"].IsEmpty())
+ {
+ dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.StuName Like @StuName ");
+ }
+ if (!queryParam["DeptNo"].IsEmpty())
+ {
+ dp.Add("DeptNo", "" + queryParam["DeptNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND t.DeptNo=@DeptNo ");
+ }
+ if (!queryParam["MajorNo"].IsEmpty())
+ {
+ dp.Add("MajorNo", "" + queryParam["MajorNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND t.MajorNo=@MajorNo ");
+ }
+ if (!queryParam["ClassNo"].IsEmpty())
+ {
+ dp.Add("ClassNo", "" + queryParam["ClassNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND t.ClassNo=@ClassNo ");
+ }
+ if (!queryParam["Grade"].IsEmpty())
+ {
+ dp.Add("Grade", "" + queryParam["Grade"].ToString() + "", DbType.String);
+ strSql.Append(" AND t.Grade=@Grade ");
+ }
+ if (!queryParam["GenderNo"].IsEmpty())
+ {
+ dp.Add("GenderNo", "" + queryParam["GenderNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND t.GenderNo=@GenderNo ");
+ }
+ if (!queryParam["IdentityCardNo"].IsEmpty())
+ {
+ dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.IdentityCardNo Like @IdentityCardNo ");
+ }
+ if (!queryParam["NationalityNo"].IsEmpty())
+ {
+ dp.Add("NationalityNo", "" + queryParam["NationalityNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND t.NationalityNo = @NationalityNo ");
+ }
+ if (!queryParam["FinishSchoolMark"].IsEmpty())
+ {
+ dp.Add("FinishSchoolMark", "" + queryParam["FinishSchoolMark"].ToString() + "", DbType.String);
+ if (queryParam["FinishSchoolMark"].ToString() == "0")
+ {
+ strSql.Append(" AND (t.FinishSchoolMark is null or t.FinishSchoolMark='0') ");
+ }
+ else
+ {
+ strSql.Append(" AND t.FinishSchoolMark=@FinishSchoolMark ");
+ }
+ }
+ if (!queryParam["Remark"].IsEmpty())
+ {
+ dp.Add("Remark", "%" + queryParam["Remark"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.Remark Like @Remark ");
+ }
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination);
}
catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs
index e16ab432b..8788fdb14 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs
@@ -1427,17 +1427,29 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
var stuInfo = this.BaseRepository("CollegeMIS")
.FindEntity(a => a.StuNo == stuNo);
+ //补考数量
var notpass1 = this.BaseRepository("CollegeMIS")
.FindList(a => a.StuNo == stuNo).Count();
+ //二次补考数量
var notpass2 = this.BaseRepository("CollegeMIS")
.FindList(a => a.StuNo == stuNo).Count();
+ //二次补考成绩小于60分的数量
+ var notpass2Low = this.BaseRepository("CollegeMIS").FindList(x => x.StuNo == stuNo && x.Score < 60).Count();
+ //由系统判定学生毕业项目达标的状态（开启“存在二次补考成绩小于60分则未达标”的判定条件）
+ var standardState = "已达标";
+
+ //TODO：待开发毕业判定条件管理
+
+
if ((notpass1 + notpass2) > 0)
{
var result = new
{
StuNo = stuInfo?.StuNo,
StuName = stuInfo?.StuName,
- IsNoPass = "是",
+ IsNoPass = "是",//是否有补考
+ IsNotPassTwoScoreLow = notpass2Low > 0 ? "是" : "否",//二次补考成绩是否小于60分
+ GraduateStandardStateBySystem = standardState,//由系统判定学生毕业项目达标的状态
FinishSchoolMark = stuInfo?.FinishSchoolMark
};
return result;
@@ -1449,6 +1461,8 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
StuNo = stuInfo?.StuNo,
StuName = stuInfo?.StuName,
IsNoPass = "否",
+ IsNotPassTwoScoreLow = "否",
+ GraduateStandardStateBySystem = standardState,
FinishSchoolMark = stuInfo?.FinishSchoolMark
};
return result;