From a59ea41dd4dbfe087199a307d1ed28089dfe08b5 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Tue, 16 May 2023 10:24:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
=?UTF-8?q?=E7=B3=BB=E9=83=A8=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=84=E5=8A=A9=E5=AE=A1=E6=A0=B8=E4=BA=BA?=
=?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/CdDept/Form.cshtml | 4 ++++
.../EducationalAdministration/Views/CdDept/Form.js | 1 +
.../EducationalAdministration/Views/CdDept/Index.js | 12 ++++++++++++
.../EducationalAdministration/CdDept/CdDeptEntity.cs | 5 +++++
4 files changed, 22 insertions(+)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.cshtml
index fea0cf3c8..d04c88482 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.cshtml
@@ -35,5 +35,9 @@
心理负责人
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/CdDept/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.js
index 3ea4c4113..4cfeac5d7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Form.js
@@ -18,6 +18,7 @@ var bootstrap = function ($, learun) {
$('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
$('#DeptDirector').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
$('#DeptpSychology').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+ $('#DeptSubsidizer').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
},
initData: function () {
if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Index.js
index ecb0572bf..246e9be25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdDept/Index.js
@@ -114,6 +114,18 @@ var bootstrap = function ($, learun) {
});
}
},
+ {
+ label: "资助审核人", name: "DeptSubsidizer", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+ key: value,
+ keyId: 'f_encode',
+ callback: function (_data) {
+ callback(_data['f_realname']);
+ }
+ });
+ }
+ },
],
mainId: 'DeptId',
isMultiselect: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptEntity.cs
index cf8bbe651..430f7a81d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptEntity.cs
@@ -77,6 +77,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("SYNCFLAG")]
public bool? SyncFlag { get; set; }
+ ///
+ /// 资助审核人
+ ///
+ [Column("DEPTSUBSIDIZER")]
+ public string DeptSubsidizer { get; set; }
#endregion
#region 扩展操作
From 467f9479413061829cf126d5d50d17e05c0e564b Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Tue, 16 May 2023 10:25:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
=?UTF-8?q?=E8=B5=84=E5=8A=A9=E7=AE=A1=E7=90=86=E4=BA=8C=E7=BA=A7=E5=AD=A6?=
=?UTF-8?q?=E9=99=A2=E5=AE=A1=E6=A0=B8=E4=BA=BA=EF=BC=9A=E7=AD=89=E4=BA=8E?=
=?UTF-8?q?=E7=B3=BB=E9=83=A8=E7=9A=84=E8=B5=84=E5=8A=A9=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E4=BA=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SchoolLevelScholarship/SchoolLevelScholarshipService.cs | 4 ++--
.../StuFellowship/StuFellowshipService.cs | 4 ++--
.../StudentWork/FamilyEconomy/FamilyEconomyService.cs | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
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 4b2fad7fb..b2d558bb2 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
@@ -85,10 +85,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
//不查看状态为草稿的记录
strSql.Append(" AND t.Status > 0 ");
- //二级学院审核专员==系部负责人==登录用户，系统管理员除外
+ //二级学院审核专员==系部的资助审核人==登录用户，系统管理员除外
if (LoginUserInfo.Get().account.ToLower() != "system")
{
- strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+ strSql.Append($" and d.DeptSubsidizer='{LoginUserInfo.Get().account}' ");
}
}
if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核
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 a8a7e346e..a0225a3b4 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
@@ -132,10 +132,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
//不查看状态为草稿的记录
strSql.Append(" AND t.Status > 0 ");
- //二级学院审核专员==系部负责人==登录用户，系统管理员除外
+ //二级学院审核专员==系部的资助审核人==登录用户，系统管理员除外
if (LoginUserInfo.Get().account.ToLower() != "system")
{
- strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+ strSql.Append($" and d.DeptSubsidizer='{LoginUserInfo.Get().account}' ");
}
}
if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/FamilyEconomy/FamilyEconomyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/FamilyEconomy/FamilyEconomyService.cs
index 2ad847e04..ffa057f94 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/FamilyEconomy/FamilyEconomyService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/FamilyEconomy/FamilyEconomyService.cs
@@ -247,10 +247,10 @@ namespace Learun.Application.TwoDevelopment.StudentWork
{
//不查看状态为草稿的记录
strSql.Append(" AND t.Status > 0 ");
- //二级学院审核专员==系部负责人==登录用户，系统管理员除外
+ //二级学院审核专员==系部的资助审核人==登录用户，系统管理员除外
if (LoginUserInfo.Get().account.ToLower() != "system")
{
- strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+ strSql.Append($" and d.DeptSubsidizer='{LoginUserInfo.Get().account}' ");
}
}
if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核