From 16c317c244e56652c6949464271eefb934d54c96 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 22 Sep 2022 09:47:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=9F=A5=E7=9C=8B=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/MealCardRunTab/Index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js index 9065303bd..ba4f5a3ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js @@ -161,6 +161,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.accountName = learun.clientdata.get(['userinfo']).realName; + param.IsPhone = "0"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; From 2eb62f970789d1e335789a0bc5513bd5e3b5c4cc Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 22 Sep 2022 09:54:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/MealCardRunTab/Index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js index ba4f5a3ac..9065303bd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js @@ -161,7 +161,6 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.accountName = learun.clientdata.get(['userinfo']).realName; - param.IsPhone = "0"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; From 9edb4a798043d97e95f4c6a8e1903c7225fe6bf6 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 22 Sep 2022 15:29:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=8F=AD=E7=BA=A7=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Index.js | 82 +++++++++++++++---- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 957ab2b27..50599ecda 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -40,18 +40,72 @@ var bootstrap = function ($, learun) { text: "majorname", param: { strWhere: "1=1 AND CheckMark=1" }, select: function (item) { - if (item) { - $('#ClassNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" } - }); + var Grades = $("#Grade").lrselectGet(); + if (Grades) { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "'" } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } } else { - $('#ClassNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1" } - }); + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } + } + } + }); + $('#Grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: "value", + text: "text", + select: function (item) { + var MajorNos = $("#MajorNo").lrselectGet(); + if (MajorNos) { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "majorno='" + item.MajorNos + "' AND CheckMark=1 AND Grade='" + item + "'" } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } + } else { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: " CheckMark=1 AND Grade='" + Grades + "'" } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } } } }); @@ -62,11 +116,7 @@ var bootstrap = function ($, learun) { value: "classno", text: "classname" }); - $('#Grade').lrselect({ - url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', - value: "value", - text: "text", - }); + $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' }); From bca79490e25b7faa38c6ecb63269ed1e6e20a991 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 22 Sep 2022 16:21:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetingManagement/MeetingManagementService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs index da8f02177..88491ed25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs @@ -136,7 +136,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement try { var data = this.BaseRepository("CollegeMIS").FindEntity(keyValue); - if (data!=null) + if (data != null) { data.ConferenceRoomName = this.BaseRepository("CollegeMIS").FindEntity(data.MeetingPlace).Name; } @@ -232,6 +232,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement else { entity.Create(userInfo); + entity.CreateTime = DateTime.Now; db.Insert(entity); } From 82833365416315ad2ee11e4c785f33e3589848c5 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 22 Sep 2022 16:45:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AF=B9=E7=8F=AD=E7=BA=A7=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Index.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 50599ecda..e9422510d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -46,13 +46,13 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "'" } + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1" } + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } }); } } else { @@ -60,13 +60,13 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" } + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1" } + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } }); } } @@ -83,13 +83,13 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.MajorNos + "' AND CheckMark=1 AND Grade='" + item + "'" } + param: { strWhere: "majorno='" + item.MajorNos + "' AND CheckMark=1 AND Grade='" + item + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1" } + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } }); } } else { @@ -97,13 +97,13 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: " CheckMark=1 AND Grade='" + Grades + "'" } + param: { strWhere: " CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1" } + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } }); } } @@ -112,7 +112,7 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrselect({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1" }, + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, value: "classno", text: "classname" });