From 2b33f6170f5034b0b21029280f9a3928f8c0ecdf Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 12 Apr 2023 18:08:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=A0=A1?= =?UTF-8?q?=E7=BA=A7=E5=A5=96=E5=AD=A6=E9=87=91=E5=AE=8C=E5=96=84=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/SchoolLevelScholarship/Form.cshtml | 64 +++-- .../Views/SchoolLevelScholarship/Form.js | 243 ++---------------- .../Views/SchoolLevelScholarship/Index.cshtml | 29 ++- .../Views/SchoolLevelScholarship/Index.js | 197 ++++++++++++-- .../IndexInStuScore.cshtml | 1 - .../SchoolLevelScholarship/IndexInStuScore.js | 13 +- .../SchoolLevelScholarshipEntity.cs | 95 +++++++ .../SchoolLevelScholarshipService.cs | 45 ++-- 8 files changed, 375 insertions(+), 312 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.cshtml index 58f18f4cd..a856f552d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.cshtml @@ -5,28 +5,36 @@
姓名*
- - 选择 + + 选择
-
+
学号*
-
所属院系*
-
+
所属院系
+
-
所属班级*
-
+
所属班级
+
身份证件类型*
- +
+
+
+
身份证件号
+ +
+
+
学年
+
-
身份证件号*
- +
学期
+
班级总人数*
@@ -36,6 +44,18 @@
成绩排名名次*
+
+
开户银行
+
+
+
+
开户行账号
+ +
+
+
开户行号
+ +
资助等级*
@@ -62,27 +82,15 @@
申请理由*
- -
-
-
开户银行*
-
-
-
-
开户行账号*
- -
-
-
开户行号
- +
备注
- + +
+
+
附件
+
- @*
-
附件上传
-
-
*@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js index f40b5f055..a03669945 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js @@ -7,20 +7,35 @@ var acceptClick; var bindData; var keyValue = request('keyValue'); +var Step = request('Step');//第几步 var bootstrap = function ($, learun) { "use strict"; var page = { init: function () { $('.lr-form-wrap').lrscroll(); + page.hide(); page.bind(); page.initData(); }, + hide: function () { + if (Step == "2") {//第二步：二级学院审核，时附件显示且必填； + $('#FilesDiv').show(); + $('#Url').attr('isvalid', 'yes'); + $('#Url').attr('checkexpession', 'NotNull'); + $('#Url').prev().html('附件*'); + } else { + $('#Url').removeAttr('isvalid'); + $('#Url').removeAttr('checkexpession'); + $('#Url').prev().html('附件'); + $('#FilesDiv').hide(); + } + }, bind: function () { - $('#DepositBank').lrDataItemSelect({ - code: 'DepositBank' - }); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' }); + $('#IdCardType').lrselectSet("01"); + $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $('#FundingLevel').lrDataItemSelect({ code: 'SchoolFundingLevel', select: function (item) { @@ -32,7 +47,7 @@ var bootstrap = function ($, learun) { } }); $('#ApplyDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); - //$('#Url').lrUploader(); + $('#Url').lrUploader(); //选择学生 $("#lr_select").on('click', function () { learun.layerForm({ @@ -46,219 +61,6 @@ var bootstrap = function ($, learun) { } }); }); - //$("#StuName").lrlayerselect({ - // treeUrl: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetClassList', - // treeParentId: 'ClassNo', - // treeValueId: 'ClassNo', - // treeTextId: 'ClassName', - // dataUrl: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetStuList', - // dataTreeId: 'ClassNo', - // dataValueId: 'StuNo', - // dataTextId: 'StuName', - // grid: [ - // { label: "学号", name: "StuNo", width: 100, align: "left" }, - // //{ label: "学籍号", name: "StuCode", width: 100, align: "left" }, - // //{ label: "考生号", name: "ksh", width: 100, align: "left" }, - // //{ label: "通知书号", name: "NoticeNo", width: 100, align: "left" }, - // { label: "姓名", name: "StuName", width: 100, align: "left" }, - // { - // label: "性别", name: "GenderNo", width: 80, align: "left", - // formatter: function (cellvalue) { - // return cellvalue == true ? "男" : "女"; - // } - // }, - // { label: "出生日期", name: "Birthday", width: 100, align: "left" }, - // { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, - // { - // label: "民族", name: "NationalityNo", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'National', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - // }, - // { - // label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'BCdPartyFace', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - // }, - // { - // 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: 100, 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: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'StudyModality', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - // }, - // { label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, - // { label: "入学年月", name: "EntranceDate", 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: "Domicile", width: 100, align: "left" }, - // { - // label: "户口分类", name: "ResidenceNo", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'ResidenceNo', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - // }, - // { - // label: "籍贯 (省)", name: "F_ProvinceId", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('custmerData', { - // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE', - // key: value, - // keyId: 'pcode', - // callback: function (_data) { - // callback(_data['pname']); - // } - // }); - // } - // }, - // { - // label: "籍贯 (市)", name: "F_CityId", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('custmerData', { - // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY', - // key: value, - // keyId: 'ccode', - // callback: function (_data) { - // callback(_data['cname']); - // } - // }); - // } - // }, - // { - // label: "籍贯 (县)", name: "F_CountyId", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('custmerData', { - // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA', - // key: value, - // keyId: 'acode', - // callback: function (_data) { - // callback(_data['aname']); - // } - // }); - // } - // }, - // { label: "备注", name: "Remark", width: 200, align: "center" }, - // { - // label: "异动状态", name: "MoveStatus", width: 80, align: "center", - // formatter: function (cellvalue) { - // return cellvalue == "1" ? "" : ""; - // } - // }, - // { - // label: "异动类型", name: "MoveType", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'StuChangeType', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - // }, - // { - // label: "审核状态", name: "CheckMark", width: 80, align: "center", - // formatter: function (cellvalue) { - // return cellvalue == "1" ? "已审核" : "未审核"; - // } - // } - // ], - // select: function (values, texts) { - // if (values && values.length > 0) { - // console.log('values', values); - // $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetStuInfoBasicEntityByStuNo?keyValue=' + values[0], function (data) { - // data = data.StuInfoBasic; - // console.log(data); - // $('#StuNo').val(data.StuNo); - // $('#DeptNo').lrselectSet(data.DeptNo); - // $('#ClassNo').val(data.ClassNo); - // $('#IdCard').val(data.IdCard); - // $('#IdCardType').val('居民身份证'); - // $('#BankCard').val(data.BankCard); - // $('#BankCode').val(data.BankCode); - // }); - // } - // }, - // unknowselect: function () { - // }, - // isMultiple: false - //}); }, initData: function () { if (!!keyValue) { @@ -297,11 +99,12 @@ var bootstrap = function ($, learun) { $('#DeptNo').lrselectSet(data.DeptNo); $('#ClassNo').lrselectSet(data.ClassNo); $('#IdCard').val(data.IdCard); - $('#IdCardType').val('居民身份证'); - $('#DepositBank').lrselectSet(data.DepositBank); - $('#BankCard').val(data.BankCard); + $('#AcademicYearNo').val(data.AcademicYearNo); + $('#Semester').val(data.Semester); $('#CalssNum').val(data.StuNum); $('#ClassRank').val(data.Num); + $('#DepositBank').lrselectSet(data.DepositBank); + $('#BankCard').val(data.BankCard); } }; page.init(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml index 4df9392af..e5d17acba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml @@ -2,21 +2,35 @@ ViewBag.Title = "校级奖学金"; Layout = "~/Views/Shared/_Index.cshtml"; } +
+
申请
+
+
+
+
发放
+
+
+
-
-
申请日期
-
-
-
-
发放日期
-
所属院系
@@ -49,7 +63,6 @@  新增  编辑  删除 -  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js index 64bac4e7e..a034494d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js @@ -7,15 +7,71 @@ var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; + var startTime; + var endTime; + var startTimeRelease; + var endTimeRelease; var page = { init: function () { page.initGird(); page.bind(); }, bind: function () { + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + $('#datesearchRelease').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + startTimeRelease = begin; + endTimeRelease = end; + page.search(); + } + }); $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 350, 400); + }, 250, 400); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' }); $('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' }); @@ -29,8 +85,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '新增', url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form', - width: 850, - height: 650, + width: 1100, + height: 700, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -40,12 +96,17 @@ var bootstrap = function ($, learun) { $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "0") { + learun.alert.warning("当前项不属于草稿状态，无法编辑！"); + return false; + } learun.layerForm({ id: 'form', title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form?keyValue=' + keyValue, - width: 850, - height: 650, + width: 1100, + height: 700, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -56,6 +117,11 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != "0") { + learun.alert.warning("当前项不属于草稿状态，无法删除！"); + return false; + } learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DeleteForm', { keyValue: keyValue}, function () { @@ -65,14 +131,11 @@ var bootstrap = function ($, learun) { }); } }); - // 打印 - $('#lr_print').on('click', function () { - $('#gridtable').jqprintTable(); - }); + }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetPageList', headData: [ { label: "学号", name: "StuNo", width: 100, align: "left"}, @@ -99,8 +162,21 @@ var bootstrap = function ($, learun) { } }); }}, - { label: "身份证件类型", name: "IdCardType", width: 100, align: "left"}, + { + label: "身份证件类型", name: "IdCardType", width: 100, align: "left" + , formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'IdCardType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: "身份证件号", name: "IdCard", width: 100, align: "left"}, + { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, + { label: "学期", name: "Semester", width: 100, align: "left" }, { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"}, { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"}, { label: "资助等级", name: "FundingLevel", width: 100, align: "left", @@ -116,27 +192,108 @@ var bootstrap = function ($, learun) { { label: "资助标准", name: "FundingCriteria", width: 100, align: "left"}, { label: "应发金额", name: "ShoudAmount", width: 100, align: "left"}, { label: "实发金额", name: "ActualAmount", width: 100, align: "left"}, - { label: "申请日期", name: "ApplyDate", width: 100, align: "left"}, - { label: "发放日期", name: "ProvideDate", width: 100, align: "left"}, + { + label: "申请日期", name: "ApplyDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { + label: "发放日期", name: "ProvideDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, { label: "申请理由", name: "ApplyAccount", width: 100, align: "left"}, - { label: "开户银行", name: "DepositBank", width: 100, align: "left"}, + { + label: "开户银行", name: "DepositBank", width: 100, align: "left" + , formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'DepositBank', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: "开户行账号", name: "BankCard", width: 100, align: "left"}, { label: "开户行号", name: "BankCode", width: 100, align: "left"}, - { label: "备注", name: "Remark", width: 100, align: "left"}, - { label: "附件上传", name: "Url", width: 100, align: "left"}, + { label: "备注说明", name: "Remark", width: 100, align: "left" }, + { + label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "已归档" : "草稿"; + } + }, + { + label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '创建时间', name: 'CreateTime', width: 130, align: "left" }, + { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" }, + { + label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" }, + { + label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" }, ], mainId:'Id', - isPage: true + isPage: true, + sidx: 'CreateTime desc' }); - page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + param.StartTime = startTime; + param.EndTime = endTime; + param.StartTimeRelease = startTimeRelease; + param.EndTimeRelease = endTimeRelease; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); + page.search(); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.cshtml index 8589c13b2..a45c218de 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.cshtml @@ -112,4 +112,3 @@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js") - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js index ecad075e5..1f897e056 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js @@ -186,16 +186,19 @@ var bootstrap = function ($, learun) { // 保存数据 acceptClick = function (callBack) { var row = $('#gridtable').jfGridGet('rowdata'); + if ($.isEmptyObject(row)) { + learun.alert.warning("请选择学生！"); + return false; + } + + row.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); + row.Semester = $('#Semester').lrselectGet(); - //var box = $('.perFestivalsBox').find('div.box.active'); - //if (box.length <= 0) { - // learun.alert.warning("请选择学生！"); - // return false; - //} if (!!callBack) { callBack(row); return true; } + }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipEntity.cs index f2b9e3d78..37706a948 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipEntity.cs @@ -119,6 +119,94 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("URL")] public string Url { get; set; } + /// + /// 学年 + /// + [Column("ACADEMICYEARNO")] + public string AcademicYearNo { get; set; } + /// + /// 学期 + /// + [Column("SEMESTER")] + public string Semester { get; set; } + /// + /// 0 草稿 1 二级学院 2 学工部 3 归档 + /// + /// + [Column("STATUS")] + public string Status { get; set; } + /// + /// 创建人 + /// + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// 创建人 + /// + /// + [Column("CREATEUSERNO")] + public string CreateUserNo { get; set; } + /// + /// 创建时间 + /// + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// 编辑人 + /// + /// + [Column("MODIFYUSERID")] + public string ModifyUserId { get; set; } + /// + /// 编辑人 + /// + /// + [Column("MODIFYUSERNO")] + public string ModifyUserNo { get; set; } + /// + /// 编辑时间 + /// + /// + [Column("MODIFYTIME")] + public DateTime? ModifyTime { get; set; } + /// + /// 提交时间 + /// + /// + [Column("SUBMITTIME")] + public DateTime? SubmitTime { get; set; } + /// + /// 提交人 + /// + /// + [Column("SUBMITUSERID")] + public string SubmitUserId { get; set; } + /// + /// 学院审核人 + /// + /// + [Column("FIRSTCHECKUSERID")] + public string FirstCheckUserId { get; set; } + /// + /// 学院审核时间 + /// + /// + [Column("FIRSTCHECKTIME")] + public DateTime? FirstCheckTime { get; set; } + /// + /// 学工部审核人 + /// + /// + [Column("SECONDCHECKUSERID")] + public string SecondCheckUserId { get; set; } + /// + /// 学工部审核时间 + /// + /// + [Column("SECONDCHECKTIME")] + public DateTime? SecondCheckTime { get; set; } #endregion #region 扩展操作 @@ -128,6 +216,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public void Create() { this.Id = Guid.NewGuid().ToString(); + this.CreateTime = DateTime.Now; + this.CreateUserId = LoginUserInfo.Get().userId; + this.CreateUserNo = LoginUserInfo.Get().account; + this.Status = "0";//草稿 } /// /// 编辑调用 @@ -136,6 +228,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public void Modify(string keyValue) { this.Id = keyValue; + this.ModifyTime = DateTime.Now; + this.ModifyUserId = LoginUserInfo.Get().userId; + this.ModifyUserNo = LoginUserInfo.Get().account; } #endregion #region 扩展字段 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs index a4fe8aec4..2dd622986 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs @@ -30,44 +30,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.Id, - t.StuNo, - t.StuName, - t.DeptNo, - t.ClassNo, - t.IdCardType, - t.IdCard, - t.CalssNum, - t.ClassRank, - t.FundingLevel, - t.FundingCriteria, - t.ShoudAmount, - t.ActualAmount, - t.ApplyDate, - t.ProvideDate, - t.ApplyAccount, - t.DepositBank, - t.BankCard, - t.BankCode, - t.Remark, - t.Url - "); + strSql.Append("SELECT t.* "); strSql.Append(" FROM SchoolLevelScholarship t "); + strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - if (!queryParam["ApplyDate"].IsEmpty()) + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) { - dp.Add("ApplyDate",queryParam["ApplyDate"].ToString(), DbType.String); - strSql.Append(" AND t.ApplyDate = @ApplyDate "); + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.ApplyDate >= @startTime AND t.ApplyDate <= @endTime ) "); } - if (!queryParam["ProvideDate"].IsEmpty()) + if (!queryParam["StartTimeRelease"].IsEmpty() && !queryParam["EndTimeRelease"].IsEmpty()) { - dp.Add("ProvideDate",queryParam["ProvideDate"].ToString(), DbType.String); - strSql.Append(" AND t.ProvideDate = @ProvideDate "); + dp.Add("StartTimeRelease", queryParam["StartTimeRelease"].ToDate(), DbType.DateTime); + dp.Add("EndTimeRelease", queryParam["EndTimeRelease"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.ProvideDate >= @StartTimeRelease AND t.ProvideDate <= @EndTimeRelease ) "); + } + if (!queryParam["StuNo"].IsEmpty()) + { + dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String); + strSql.Append(" AND t.StuNo Like @StuNo "); } if (!queryParam["DeptNo"].IsEmpty()) {