diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.js
index f9fda96d1..81af5ed76 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.js
@@ -5,10 +5,14 @@
* 描 述：定制功能助学金
*/
var refreshGirdData;
+var types = request('types');//助学金类型：1国家助学金，2校级助学金
+console.log(types == "1" ? "国家助学金" : types == "2" ? "校级助学金" : "");
var bootstrap = function ($, learun) {
"use strict";
- var logbegin = '';
- var logend = '';
+ var startTime;
+ var endTime;
+ var startTimeRelease;
+ var endTimeRelease;
var page = {
init: function () {
page.initGird();
@@ -20,7 +24,7 @@ var bootstrap = function ($, learun) {
{ 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') } },
+ { 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,
@@ -34,21 +38,45 @@ var bootstrap = function ($, learun) {
preyShow: false,
yShow: false,
// 默认
+ dfvalue: '1',
selectfn: function (begin, end) {
- logbegin = begin;
- logend = 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);
- }, 400, 400);
+ }, 350, 400);
//下拉框绑定
- $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
- $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+ $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
- $('#OpenBank').lrDataItemSelect({ code: 'DepositBank' });
$('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' });
// 刷新
@@ -60,8 +88,8 @@ var bootstrap = function ($, learun) {
learun.layerForm({
id: 'form',
title: '新增',
- url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form',
- width: 800,
+ url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form?Types=' + types,
+ width: 1000,
height: 600,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
@@ -72,11 +100,16 @@ 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/StuFellowship/Form?keyValue=' + keyValue,
- width: 800,
+ url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form?Types=' + types + '&keyValue=' + keyValue,
+ width: 1000,
height: 600,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
@@ -88,6 +121,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/StuFellowship/DeleteForm', { keyValue: keyValue }, function () {
@@ -97,65 +135,93 @@ var bootstrap = function ($, learun) {
});
}
});
+ // 提交二级学院审核
+ $('#lr_submit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ var Status = $('#gridtable').jfGridValue('Status');
+ if (Status != "0") {
+ learun.alert.warning("当前项不属于草稿状态，无法提交学院审核！");
+ return false;
+ }
+ learun.layerConfirm('是否确认提交该项！', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/DoSubmit', { keyValue: keyValue, status: '1', step: '1' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
},
initGird: function () {
- $('#gridtable').lrAuthorizeJfGrid({
+ $('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/GetPageList',
headData: [
{ label: '学号', name: 'StuNo', width: 120, align: "left" },
{ label: '姓名', name: 'StuName', width: 150, align: "left" },
{
- label: "系所", name: "DeptNo", width: 100, align: "left",
+ label: '院校', name: 'F_SchoolId', width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
key: value,
- keyId: 'deptno',
+ keyId: 'f_companyid',
callback: function (_data) {
- callback(_data['deptname']);
+ callback(_data['f_fullname']);
}
});
}
},
{
- label: "专业", name: "MajorNo", width: 100, align: "left",
+ label: "所属班级", name: "ClassNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
key: value,
- keyId: 'majorno',
+ keyId: 'classno',
callback: function (_data) {
- callback(_data['majorname']);
+ callback(_data['classname']);
}
});
}
},
{
- 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',
+ label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
+ , formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
key: value,
- keyId: 'classno',
+ code: 'IdCardType',
callback: function (_data) {
- callback(_data['classname']);
+ callback(_data.text);
}
});
}
},
+ { label: '身份证件号', name: 'IdentityCardNo', width: 160, align: "left" },
{
- label: '证件类型', name: 'IdCardType', width: 100, align: "left"
+ label: '资助等级', name: 'SubsidizeType', width: 100, align: "left"
, formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
- code: 'IdCardType',
+ code: 'StateStipend',
callback: function (_data) {
callback(_data.text);
}
});
}
},
- { label: '身份证号', name: 'IdentityCardNo', width: 160, align: "left" },
+ { label: '资助标准', name: 'FunderNationStandard', width: 100, align: "left" },
+ { label: '应发金额', name: 'AmountPayable', width: 100, align: "left" },
+ { label: '实发金额', name: 'FinalPayingAmount', width: 100, align: "left" },
+ {
+ label: '申请日期', name: 'ApplyDate', width: 100, align: "left",
+ formatter: function (cellvalue) {
+ return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+ }
+ },
+ { label: '发放日期', name: 'ReleaseDate', width: 100, align: "left" },
+ { label: '申请理由', name: 'ApplyReason', width: 200, align: "left" },
{
label: '开户银行', name: 'OpenBank', width: 200, align: "left"
, formatterAsync: function (callback, value, row, op, $cell) {
@@ -170,62 +236,82 @@ var bootstrap = function ($, learun) {
},
{ label: '开户卡账号', name: 'OpenAccount', width: 200, align: "left" },
{ label: '开户行号', name: 'OpenBankNo', width: 120, align: "left" },
+ { label: '备注说明', name: 'Remark', width: 200, align: "left" },
{
- label: '资助等级', name: 'SubsidizeType', width: 100, align: "left"
- , formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('dataItem', {
+ 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,
- code: 'StateStipend',
+ keyId: 'f_userid',
callback: function (_data) {
- callback(_data.text);
+ callback(_data['f_realname']);
}
});
}
},
- { label: '资助标准', name: 'FunderNationStandard', width: 100, align: "left" },
- { label: '应发金额', name: 'AmountPayable', width: 100, align: "left" },
- { label: '实发金额', name: 'FinalPayingAmount', width: 100, align: "left" },
+ { label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
+ { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" },
{
- label: '申请时间', name: 'CreateDate', width: 100, align: "left",
- formatter: function (cellvalue) {
- return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+ 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: 'ReleaseDate', width: 200, align: "left" },
- { label: '申请理由', name: 'ApplyReason', width: 200, align: "left" },
- { label: '备注', name: 'Remark', width: 200, align: "left" },
{
- label: '状态', name: 'State', width: 100, align: "left",
- formatter: function (cellvalue, row) {
- if (cellvalue == 2) {
- return "
二级学院";
- } else if (cellvalue == 3) {
- return "
学工部";
- } else if (cellvalue == 2) {
- return "
归档";
- } else if (cellvalue == 1) {
- return "
草稿";
- }
+ label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+ key: value,
+ keyId: 'f_userid',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
+ { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" },
+ {
+ label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+ key: value,
+ keyId: 'f_userid',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
}
},
+ { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" },
],
mainId: 'ID',
isPage: true,
- sidx: 'CreateDate',
- sord: 'ASC'
+ sidx: 'CreateTime desc'
});
- page.search();
},
search: function (param) {
param = param || {};
- param.SqlParam = " and Types = 1"
- param.StartTime = logbegin;
- param.EndTime = logend;
+ param.Types = types;
+ 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/StudentWork/Views/FamilyEconomy/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.cshtml
index 5289ae667..4ac96703a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.cshtml
@@ -33,7 +33,7 @@
申请时间*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.js
index d0d228f90..a47b98a94 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.js
@@ -33,6 +33,7 @@ var bootstrap = function ($, learun) {
$('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
$('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
+ $('#IdCardType').lrselectSet('01');
$('#StuNo').lrGirdSelect({
// 字段
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
@@ -97,7 +98,6 @@ var bootstrap = function ($, learun) {
$("#F_SchoolId").lrselectSet(item.f_schoolid);
$("#ClassNo").lrselectSet(item.classno);
$("#IdentityCardNo").val(item.identitycardno);
- $('#IdCardType').lrselectSet('01');
}
});
//申请时间：默认当天
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipBLL.cs
index cfe38dfb3..b849a4312 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipBLL.cs
@@ -142,6 +142,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
+
+ ///
+ /// 提交
+ ///
+ ///
主键
+ public void DoSubmit(string keyValue, string status, string step)
+ {
+ try
+ {
+ stuFellowshipService.DoSubmit(keyValue, status, step);
+
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipEntity.cs
index 591b4d011..bc489d9ef 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipEntity.cs
@@ -27,54 +27,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("STUNO")]
public string StuNo { get; set; }
///
- /// 姓名
- ///
- ///
- [Column("STUNAME")]
- public string StuName { get; set; }
- ///
- /// 系部
- ///
- ///
- [Column("DEPTNO")]
- public string DeptNo { get; set; }
- ///
- /// 专业
- ///
- ///
- [Column("MAJORNO")]
- public string MajorNo { get; set; }
- ///
- /// 班级
- ///
- ///
- [Column("CLASSNO")]
- public string ClassNo { get; set; }
- ///
- /// 证件类型 默认身份证
- ///
- ///
- [Column("IDCARDTYPE")]
- public string IdCardType { get; set; }
- ///
- /// 身份证号
- ///
- ///
- [Column("IDENTITYCARDNO")]
- public string IdentityCardNo { get; set; }
- ///
- /// 开户银行
- ///
- ///
- [Column("OPENBANK")]
- public string OpenBank { get; set; }
- ///
- /// 开户卡账号
- ///
- ///
- [Column("OPENACCOUNT")]
- public string OpenAccount { get; set; }
- ///
/// 开户行号
///
///
@@ -87,13 +39,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("SUBSIDIZETYPE")]
public string SubsidizeType { get; set; }
///
- /// 资助金额
+ /// 资助标准
///
///
[Column("FUNDERNATIONSTANDARD")]
public decimal? FunderNationStandard { get; set; }
///
- /// AmountPayable
+ /// 应发金额
///
///
[Column("AMOUNTPAYABLE")]
@@ -105,12 +57,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("FINALPAYINGAMOUNT")]
public decimal? FinalPayingAmount { get; set; }
///
- /// 创建时间
- ///
- ///
- [Column("CREATEDATE")]
- public DateTime? CreateDate { get; set; }
- ///
/// 申请时间
///
///
@@ -121,7 +67,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
///
[Column("RELEASEDATE")]
- public string ReleaseDate { get; set; }
+ public DateTime? ReleaseDate { get; set; }
///
/// 申请理由
///
@@ -141,17 +87,89 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("FILES")]
public string Files { get; set; }
///
- /// 1 草稿 2 二级学院 3 学工部 4 归档
+ /// 0 草稿 1 二级学院 2 学工部 3 归档
///
///
- [Column("STATE")]
- public string State { get; set; }
+ [Column("STATUS")]
+ public string Status { get; set; }
///
- /// 助学金类型 1国家级 2校级
+ /// 助学金类型：1国家助学金，2校级助学金
///
///
[Column("TYPES")]
public string Types { 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 扩展操作
@@ -161,6 +179,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";//草稿
}
///
/// 编辑调用
@@ -169,8 +191,59 @@ 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 扩展字段
+
+ ///
+ /// 姓名
+ ///
+ ///
+ [NotMapped]
+ public string StuName { get; set; }
+ ///
+ /// 院校
+ ///
+ ///
+ [NotMapped]
+ public string F_SchoolId { get; set; }
+ ///
+ /// 班级
+ ///
+ ///
+ [NotMapped]
+ public string ClassNo { get; set; }
+ ///
+ /// 身份证件号
+ ///
+ ///
+ [NotMapped]
+ public string IdentityCardNo { get; set; }
+ ///
+ /// 身份证件类型
+ ///
+ ///
+ [NotMapped]
+ public string IdCardType { get; set; }
+ ///
+ /// 开户银行
+ ///
+ ///
+ [NotMapped]
+ public string OpenBank { get; set; }
+ ///
+ /// 开户卡账号
+ ///
+ ///
+ [NotMapped]
+ public string OpenAccount { get; set; }
+
+ #endregion
+
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipIBLL.cs
index 0a6a1df83..eb2445c3b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipIBLL.cs
@@ -49,6 +49,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// 主键
/// 实体
void SaveEntity(string keyValue, StuFellowshipEntity entity);
+
+ ///
+ /// 提交
+ ///
+ /// 主键
+ void DoSubmit(string keyValue, string status, string step);
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs
index 93b6a2190..178e00db7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs
@@ -66,77 +66,65 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT t.*");
+ strSql.Append("SELECT t.*,s.StuName,s.F_SchoolId,s.ClassNo,s.IdentityCardNo,s.IdCardType,s.DepositBank as OpenBank,s.BankCard as OpenAccount ");
strSql.Append(" FROM StuFellowship 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["SqlParam"].IsEmpty())
+
+ if (!queryParam["Types"].IsEmpty())//助学金类型：1国家助学金，2校级助学金
{
- strSql.Append(queryParam["SqlParam"].ToString());
+ dp.Add("Types", queryParam["Types"].ToString(), DbType.String);
+ strSql.Append(" AND t.Types=@Types ");
}
if (!queryParam["StuNo"].IsEmpty())
{
- dp.Add("StuNo", "%"+queryParam["StuNo"].ToString()+ "%", DbType.String);
+ dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
strSql.Append(" AND t.StuNo Like @StuNo ");
}
- if (!queryParam["IdentityCardNo"].IsEmpty())
- {
- dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.IdentityCardNo like @IdentityCardNo ");
- }
if (!queryParam["StuName"].IsEmpty())
{
dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.StuName Like @StuName ");
+ strSql.Append(" AND s.StuName Like @StuName ");
}
- if (!queryParam["DeptNo"].IsEmpty())
+ if (!queryParam["F_SchoolId"].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 ");
+ dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);
+ strSql.Append(" AND s.F_SchoolId=@F_SchoolId ");
}
if (!queryParam["ClassNo"].IsEmpty())
{
dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
- strSql.Append(" AND t.ClassNo=@ClassNo ");
+ strSql.Append(" AND s.ClassNo=@ClassNo ");
}
- if (!queryParam["Grade"].IsEmpty())
+ if (!queryParam["IdentityCardNo"].IsEmpty())
{
- dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);
- strSql.Append(" AND t.Grade=@Grade ");
+ dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String);
+ strSql.Append(" AND s.IdentityCardNo like @IdentityCardNo ");
}
if (!queryParam["SubsidizeType"].IsEmpty())
{
- dp.Add("SubsidizeType", "" + queryParam["SubsidizeType"].ToString() + "", DbType.String);
+ dp.Add("SubsidizeType", queryParam["SubsidizeType"].ToString(), DbType.String);
strSql.Append(" AND t.SubsidizeType=@SubsidizeType ");
}
- if (!queryParam["OpenAccount"].IsEmpty())
- {
- dp.Add("OpenAccount", "" + queryParam["OpenAccount"].ToString() + "", DbType.String);
- strSql.Append(" AND t.OpenAccount=@OpenAccount ");
- }
- if (!queryParam["OpenBank"].IsEmpty())
- {
- dp.Add("OpenBank", "" + queryParam["OpenBank"].ToString() + "", DbType.String);
- strSql.Append(" AND t.OpenBank=@OpenBank ");
- }
- if (!queryParam["ReleaseDate"].IsEmpty())
+ if (!queryParam["OpenBankNo"].IsEmpty())
{
- dp.Add("ReleaseDate", "%" + queryParam["ReleaseDate"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.ReleaseDate Like @ReleaseDate ");
+ dp.Add("OpenBankNo", "%" + queryParam["OpenBankNo"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.OpenBankNo Like @OpenBankNo ");
}
if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
{
dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
- strSql.Append(" AND ( CreateDate >= @startTime AND CreateDate <= @endTime ) ");
+ strSql.Append(" AND ( t.ApplyDate >= @startTime AND t.ApplyDate <= @endTime ) ");
+ }
+ if (!queryParam["StartTimeRelease"].IsEmpty() && !queryParam["EndTimeRelease"].IsEmpty())
+ {
+ dp.Add("StartTimeRelease", queryParam["StartTimeRelease"].ToDate(), DbType.DateTime);
+ dp.Add("EndTimeRelease", queryParam["EndTimeRelease"].ToDate(), DbType.DateTime);
+ strSql.Append(" AND ( t.ReleaseDate >= @StartTimeRelease AND t.ReleaseDate <= @EndTimeRelease ) ");
}
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);
}
@@ -162,7 +150,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
try
{
- return this.BaseRepository("CollegeMIS").FindEntity(keyValue);
+ var strsql = $"select t.*,s.StuName,s.F_SchoolId,s.ClassNo,s.IdentityCardNo,s.IdCardType,s.DepositBank as OpenBank,s.BankCard as OpenAccount from StuFellowship t left join StuInfoBasic s on t.StuNo=s.StuNo where 1=1 and t.ID='{keyValue}' ";
+ return this.BaseRepository("CollegeMIS").FindEntity(strsql, null);
}
catch (Exception ex)
{
@@ -237,6 +226,42 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
+
+ ///
+ /// 提交
+ ///
+ /// 主键
+ public void DoSubmit(string keyValue, string status, string step)
+ {
+ try
+ {
+ if (step == "1")//第一步：提交二级学院审核
+ {
+ this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set SubmitTime='{DateTime.Now}',SubmitUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+ }
+ else if (step == "2")//第二步：提交学工部审核
+ {
+ this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+ }
+ else if (step == "3")//第三步：归档
+ {
+ this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+ }
+
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
#endregion
}
From 17617dabafe7a81c983c608c050f6b55abe6e2cd Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Mon, 3 Apr 2023 16:49:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?=
=?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=8A=A9=E5=AD=A6=E9=87=91(=E4=BA=8C?=
=?UTF-8?q?=E7=BA=A7=E5=AD=A6=E9=99=A2)=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/StuFellowshipController.cs | 21 ++
.../Views/StuFellowship/IndexOfTwo.cshtml | 83 +++++
.../Views/StuFellowship/IndexOfTwo.js | 305 ++++++++++++++++++
.../Learun.Application.Web.csproj | 2 +
.../StuFellowship/StuFellowshipBLL.cs | 24 ++
.../StuFellowship/StuFellowshipIBLL.cs | 5 +
.../StuFellowship/StuFellowshipService.cs | 50 +++
7 files changed, 490 insertions(+)
create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.cshtml
create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuFellowshipController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuFellowshipController.cs
index aec0d80b6..e509cee42 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuFellowshipController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuFellowshipController.cs
@@ -49,6 +49,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
ViewBag.ClassNo = ClassNos.TrimEnd(',');
return View();
}
+ ///
+ /// 主页面【二级学院】
+ ///
+ ///
+ [HttpGet]
+ public ActionResult IndexOfTwo()
+ {
+ return View();
+ }
#endregion
#region 获取数据
@@ -148,6 +157,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
stuFellowshipIBLL.DoSubmit(keyValue, status, step);
return Success("操作成功！");
}
+ ///
+ /// 退回
+ ///
+ /// 主键
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult DoBack(string keyValue, string status, string step)
+ {
+ stuFellowshipIBLL.DoBack(keyValue, status, step);
+ return Success("操作成功！");
+ }
#endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.cshtml
new file mode 100644
index 000000000..962affddd
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.cshtml
@@ -0,0 +1,83 @@
+@{
+ ViewBag.Title = "助学金管理";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js
new file mode 100644
index 000000000..e2189bc59
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js
@@ -0,0 +1,305 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日 期：2023-03-13 10:37
+ * 描 述：定制功能助学金
+ */
+var refreshGirdData;
+var types = request('types');//助学金类型：1国家助学金，2校级助学金
+console.log(types == "1" ? "国家助学金" : types == "2" ? "校级助学金" : "");
+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);
+ //下拉框绑定
+ $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+ $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+ $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' });
+
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 编辑
+ $('#lr_edit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ var Status = $('#gridtable').jfGridValue('Status');
+ if (Status != "1") {
+ learun.alert.warning("当前项不属于学院审核状态，无法编辑！");
+ return false;
+ }
+ learun.layerForm({
+ id: 'formOfTwo',
+ title: '审核',
+ url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/Form?Types=' + types + '&Step=2&keyValue=' + keyValue,
+ width: 1000,
+ height: 600,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ }
+ });
+ // 提交学工部审核
+ $('#lr_submit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ var Status = $('#gridtable').jfGridValue('Status');
+ if (Status != "1") {
+ learun.alert.warning("当前项不属于学院审核状态，无法提交学工部审核！");
+ return false;
+ }
+ learun.layerConfirm('是否确认提交该项！', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/DoSubmit', { keyValue: keyValue, status: '2', step: '2' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ // 退回辅导员
+ $('#lr_back').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ var Status = $('#gridtable').jfGridValue('Status');
+ if (Status != "1") {
+ learun.alert.warning("当前项不属于学院审核状态，无法退回辅导员！");
+ return false;
+ }
+ learun.layerConfirm('是否确认退回该项！', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuFellowship/DoBack', { keyValue: keyValue, status: '0', step: '2' }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ },
+ initGird: function () {
+ $('#gridtable').jfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuFellowship/GetPageList',
+ headData: [
+ { label: '学号', name: 'StuNo', width: 120, align: "left" },
+ { label: '姓名', name: 'StuName', width: 150, align: "left" },
+ {
+ label: '院校', name: 'F_SchoolId', width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+ key: value,
+ keyId: 'f_companyid',
+ callback: function (_data) {
+ callback(_data['f_fullname']);
+ }
+ });
+ }
+ },
+ {
+ label: "所属班级", name: "ClassNo", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+ key: value,
+ keyId: 'classno',
+ callback: function (_data) {
+ callback(_data['classname']);
+ }
+ });
+ }
+ },
+ {
+ label: '身份证件类型', name: 'IdCardType', width: 100, align: "left"
+ , formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'IdCardType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: '身份证件号', name: 'IdentityCardNo', width: 160, align: "left" },
+ {
+ label: '资助等级', name: 'SubsidizeType', width: 100, align: "left"
+ , formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'StateStipend',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: '资助标准', name: 'FunderNationStandard', width: 100, align: "left" },
+ { label: '应发金额', name: 'AmountPayable', width: 100, align: "left" },
+ { label: '实发金额', name: 'FinalPayingAmount', width: 100, align: "left" },
+ {
+ label: '申请日期', name: 'ApplyDate', width: 100, align: "left",
+ formatter: function (cellvalue) {
+ return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+ }
+ },
+ { label: '发放日期', name: 'ReleaseDate', width: 100, align: "left" },
+ { label: '申请理由', name: 'ApplyReason', width: 200, align: "left" },
+ {
+ label: '开户银行', name: 'OpenBank', width: 200, 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: 'OpenAccount', width: 200, align: "left" },
+ { label: '开户行号', name: 'OpenBankNo', width: 120, align: "left" },
+ { label: '备注说明', name: 'Remark', width: 200, align: "left" },
+ {
+ label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "已归档" : "草稿";
+ }
+ },
+ {
+ label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+ key: value,
+ keyId: 'f_userid',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
+ { label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
+ { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" },
+ {
+ label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+ key: value,
+ keyId: 'f_userid',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
+ {
+ label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+ key: value,
+ keyId: 'f_userid',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
+ { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" },
+ {
+ label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+ key: value,
+ keyId: 'f_userid',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
+ { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" },
+ ],
+ mainId: 'ID',
+ isPage: true,
+ sidx: 'SubmitTime desc'
+ });
+ },
+ search: function (param) {
+ param = param || {};
+ param.Types = types;
+ param.StartTime = startTime;
+ param.EndTime = endTime;
+ param.StartTimeRelease = startTimeRelease;
+ param.EndTimeRelease = endTimeRelease;
+ param.Step = "2";//第二步：二级学院审核
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ page.search();
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index d542eca60..9c5c6e13d 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
@@ -997,6 +997,7 @@
+
@@ -8122,6 +8123,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipBLL.cs
index b849a4312..8e59eda77 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipBLL.cs
@@ -166,6 +166,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
}
+ ///
+ /// 退回
+ ///
+ /// 主键
+ public void DoBack(string keyValue, string status, string step)
+ {
+ try
+ {
+ stuFellowshipService.DoBack(keyValue, status, step);
+
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipIBLL.cs
index eb2445c3b..d750012c1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipIBLL.cs
@@ -55,6 +55,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
///
主键
void DoSubmit(string keyValue, string status, string step);
+ ///
+ /// 退回
+ ///
+ ///
主键
+ void DoBack(string keyValue, string status, string step);
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs
index 178e00db7..14f896f67 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs
@@ -69,6 +69,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
strSql.Append("SELECT t.*,s.StuName,s.F_SchoolId,s.ClassNo,s.IdentityCardNo,s.IdCardType,s.DepositBank as OpenBank,s.BankCard as OpenAccount ");
strSql.Append(" FROM StuFellowship t ");
strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo ");
+ strSql.Append(" left join ClassInfo c on t.CreateUserNo=c.ClassTutorNo and s.ClassNo=c.ClassNo ");
+ strSql.Append(" left join CdDept d on c.DeptNo=d.DeptNo ");
strSql.Append(" where 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
@@ -126,6 +128,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("EndTimeRelease", queryParam["EndTimeRelease"].ToDate(), DbType.DateTime);
strSql.Append(" AND ( t.ReleaseDate >= @StartTimeRelease AND t.ReleaseDate <= @EndTimeRelease ) ");
}
+ if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "2")//第二步：二级学院审核
+ {
+ //不查看状态为草稿的记录
+ strSql.Append(" AND t.Status > 0 ");
+ //二级学院审核专员==系部负责人==登录用户
+ strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+ }
+ if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核
+ {
+ //不查看状态为草稿的记录
+ strSql.Append(" AND t.Status > 1 ");
+ }
+ if (!queryParam["Status"].IsEmpty())
+ {
+ dp.Add("Status", queryParam["Status"].ToString(), DbType.String);
+ strSql.Append(" AND t.Status = @Status ");
+ }
return this.BaseRepository("CollegeMIS").FindList
(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
@@ -262,6 +281,37 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
+ ///
+ /// 退回
+ ///
+ /// 主键
+ public void DoBack(string keyValue, string status, string step)
+ {
+ try
+ {
+ if (step == "2")//第二步：退回辅导员
+ {
+ this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+ }
+ else if (step == "3")//第三步：退回辅导员、退回二级学院
+ {
+ this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuFellowship set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+ }
+
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
+
#endregion
}
From d353340f53817f939b21b5197a813b84e940b065 Mon Sep 17 00:00:00 2001
From: ndbs
Date: Tue, 4 Apr 2023 17:46:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?app2.0=E8=80=83=E5=8A=A1=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=20=E6=95=99=E5=B8=88/=E5=AD=A6=E7=94=9F=20=E8=80=83=E8=AF=95?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Exam_ArrangeExamTermNewService.cs | 17 +
.../LearunApp-2.2.0/pages.json | 14 +
.../ArrangeExamTerm/list.vue | 368 ++++++++++++++++++
.../ArrangeExamTermNew/list.vue | 344 ++++++++++++++++
4 files changed, 743 insertions(+)
create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTerm/list.vue
create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTermNew/list.vue
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs
index 77633c8df..5f4ccbfcf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs
@@ -132,10 +132,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
strSql.Append(" and t.LessonNo like '%" + queryParam["LessonNo"].ToString() + "%' ");
}
+ if (!queryParam["LessonName"].IsEmpty())
+ {
+ strSql.Append(" and t.LessonName like '%" + queryParam["LessonName"].ToString() + "%' ");
+ }
if (!queryParam["ClassNo"].IsEmpty())
{
strSql.Append(" and t.ClassNo='" + queryParam["ClassNo"].ToString() + "' ");
}
+ if (!queryParam["ClassName"].IsEmpty())
+ {
+ strSql.Append(" and t.ClassName like'%" + queryParam["ClassName"].ToString() + "%' ");
+ }
if (!queryParam["StuNo"].IsEmpty())
{
strSql.Append(" and t.StuNo='" + queryParam["StuNo"].ToString() + "' ");
@@ -144,10 +152,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
strSql.Append(" and t.EmpNo like '%" + queryParam["EmpNo"].ToString() + "%' ");
}
+ if (!queryParam["EmpName"].IsEmpty())
+ {
+ strSql.Append(" and t.EmpName like '%" + queryParam["EmpName"].ToString() + "%' ");
+ }
if (!queryParam["ClassRoomNo"].IsEmpty())
{
strSql.Append(" and t.ClassRoomNo='" + queryParam["ClassRoomNo"].ToString() + "' ");
}
+ if (!queryParam["ClassRoomName"].IsEmpty())
+ {
+ strSql.Append(" and t.ClassRoomName like '%" + queryParam["ClassRoomName"].ToString() + "%' ");
+ }
if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
{
strSql.Append(" AND ( ExamDate >= '" + queryParam["StartTime"].ToString() + "' AND ExamDate <= '" + queryParam["EndTime"].ToString() + "' ) ");
@@ -167,6 +183,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
}
+
///
/// 获取页面显示列表数据
///
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index c4be81c09..ff1ff458b 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
@@ -1155,6 +1155,20 @@
"style": {
"navigationBarTitleText": "资产详情"
}
+ },
+ //考试安排教师功能
+ {
+ "path": "pages/EducationalAdministration/ArrangeExamTermNew/list",
+ "style": {
+ "navigationBarTitleText": "考试安排"
+ }
+ },
+ //考试安排学生功能
+ {
+ "path": "pages/EducationalAdministration/ArrangeExamTerm/list",
+ "style": {
+ "navigationBarTitleText": "考试安排"
+ }
}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTerm/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTerm/list.vue
new file mode 100644
index 000000000..b7f74ad90
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTerm/list.vue
@@ -0,0 +1,368 @@
+
+
+
+
+
+ {{ tips }}
+
+
+
+
+
+
+
+
+ 考试日期：
+ {{ displayListItem(item, 'ExamDate') }}
+
+
+
+ 考试时间：
+ {{ displayListItem(item, 'ExamTime') }}
+
+
+
+ 课程编号：
+ {{ displayListItem(item, 'LessonNo') }}
+
+
+
+ 课程名称：
+ {{ displayListItem(item, 'LessonName') }}
+
+
+
+ 教师名称：
+ {{ displayListItem(item, 'EmpName') }}
+
+
+
+ 教室名称：
+ {{ displayListItem(item, 'ClassroomName') }}
+
+
+
+ 座位编号：
+ {{ displayListItem(item, 'SitNumber') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置查询条件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTermNew/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTermNew/list.vue
new file mode 100644
index 000000000..86708e937
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTermNew/list.vue
@@ -0,0 +1,344 @@
+
+
+
+
+
+ {{ tips }}
+
+
+
+
+
+
+
+
+ 考试日期：
+ {{ displayListItem(item, 'ExamDate') }}
+
+
+
+ 考试时间：
+ {{ displayListItem(item, 'ExamTime') }}
+
+
+
+ 课程编号：
+ {{ displayListItem(item, 'LessonNo') }}
+
+
+
+ 课程名称：
+ {{ displayListItem(item, 'LessonName') }}
+
+
+
+ 教室名称：
+ {{ displayListItem(item, 'ClassroomName') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置查询条件
+
+
+
+
+
+
+
+
+
+
+
+
+
+