From cb8fbcad9aa9906e4f7c1d4c58d5ffab304924b8 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 23 Aug 2022 15:36:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=A4=84=E5=88=86/?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=20=E4=BC=98=E5=8C=96=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuEncourgement/Index.cshtml | 13 +++--- .../Views/StuEncourgement/Index.js | 45 ++++++++++++++++--- .../Views/StuPunishment/Index.cshtml | 7 ++- .../Views/StuPunishment/Index.js | 33 +++++++++++++- .../MealCardRunTab/MealCardRunTabService.cs | 4 +- .../StuEncourgement/StuEncourgementService.cs | 8 ++-- .../StuPunishment/StuPunishmentService.cs | 7 +-- 7 files changed, 90 insertions(+), 27 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml index 48982f154..44eaca017 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml @@ -7,24 +7,23 @@
+
+
+
学号
- +
姓名
- +
奖励名称
- -
-
-
奖励日期
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js index 8b5acb4bb..d34ee22bd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js @@ -7,15 +7,44 @@ var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; + var startTime; + var endTime; 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(); + } + }); $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 300, 400); + }, 200, 400); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -68,12 +97,12 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageList', headData: [ - { label: "学号", name: "StuNo", width: 100, align: "left"}, - { label: "姓名", name: "StuName", width: 100, align: "left"}, - { label: "奖励名称", name: "EncourgeName", width: 100, align: "left"}, - { label: "奖励原因", name: "Reason", width: 100, align: "left"}, - { label: "奖励金额", name: "Fee", width: 100, align: "left"}, - { label: "奖励日期", name: "EncourgeDate", width: 100, align: "left"}, + { label: "学号", name: "StuNo", width: 200, align: "left"}, + { label: "姓名", name: "StuName", width: 200, align: "left"}, + { label: "奖励名称", name: "EncourgeName", width: 200, align: "left"}, + { label: "奖励原因", name: "Reason", width: 200, align: "left"}, + { label: "奖励金额", name: "Fee", width: 200, align: "left"}, + { label: "奖励日期", name: "EncourgeDate", width: 200, align: "left"}, ], mainId:'ID', isPage: true @@ -82,6 +111,8 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml index 67c53874f..bc90ff2f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml @@ -7,6 +7,9 @@
+
+
+
@@ -22,10 +25,6 @@
处分名称
-
-
处分日期
- -
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js index 9562bac1f..bfd3fa9f5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js @@ -7,15 +7,44 @@ var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; + var startTime; + var endTime; 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(); + } + }); $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 300, 400); + }, 200, 400); $('#PunishNo').lrDataItemSelect({ code: 'Punishment' }); // 刷新 @@ -137,6 +166,8 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs index f4447cc5e..c274f584c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs @@ -220,7 +220,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); strSql.Append(" AND ( t.occurTime >= @startTime AND t.occurTime <= @endTime ) "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + var data = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + data = data.OrderByDescending(x => x.centralTm); + return data; } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs index 3f3de8b01..b45777feb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs @@ -82,12 +82,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EncourgeName", "%" + queryParam["EncourgeName"].ToString() + "%", DbType.String); strSql.Append(" AND t.EncourgeName Like @EncourgeName "); } - if (!queryParam["EncourgeDate"].IsEmpty()) + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) { - dp.Add("EncourgeDate", queryParam["EncourgeDate"].ToString(), DbType.String); - strSql.Append(" AND t.EncourgeDate = @EncourgeDate "); + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.EncourgeDate >= @startTime AND t.EncourgeDate <= @endTime ) "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs index 2ec5e0fa2..65e555839 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs @@ -77,10 +77,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("PunishNo", queryParam["PunishNo"].ToString(), DbType.String); strSql.Append(" AND t.PunishNo = @PunishNo "); } - if (!queryParam["PunishDate"].IsEmpty()) + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) { - dp.Add("PunishDate", queryParam["PunishDate"].ToString(), DbType.String); - strSql.Append(" AND t.PunishDate = @PunishDate "); + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.PunishDate >= @startTime AND t.PunishDate <= @endTime ) "); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } From f4d561ef525587263d477de3445182da2f0e0c4e Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 23 Aug 2022 15:54:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9=E4=B8=89=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/StuEncourgement/Index.js | 2 +- .../EducationalAdministration/Views/StuPunishment/Index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js index d34ee22bd..895fc8c16 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { preyShow: false, yShow: false, // 默认 - dfvalue: '1', + dfvalue: '3', selectfn: function (begin, end) { startTime = begin; endTime = end; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js index bfd3fa9f5..7b6fd23d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { preyShow: false, yShow: false, // 默认 - dfvalue: '1', + dfvalue: '3', selectfn: function (begin, end) { startTime = begin; endTime = end; From 02b1f2162acbb7d13d58b87f07d18f2f15aa2775 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 23 Aug 2022 17:31:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?app2.0=20=E4=B8=80=E5=8D=A1=E9=80=9A?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MealCardRunTab/MealCardRunTabService.cs | 4 +--- .../LearunApp-2.2.0/pages/MealCardRunTab/list.vue | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs index c274f584c..f4447cc5e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs @@ -220,9 +220,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); strSql.Append(" AND ( t.occurTime >= @startTime AND t.occurTime <= @endTime ) "); } - var data = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); - data = data.OrderByDescending(x => x.centralTm); - return data; + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/MealCardRunTab/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/MealCardRunTab/list.vue index bafee7915..7bafb76c1 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/MealCardRunTab/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/MealCardRunTab/list.vue @@ -188,7 +188,9 @@ let _postParam = { pagination: { rows: _this.rows, - page: _this.page + page: _this.page, + sidx: 'centralTm', + sord: 'desc', }, queryJson: JSON.stringify(_this.multipleData) }; From e284768377b20fbb7fdcf3b68079dffefb47d55d Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 23 Aug 2022 18:03:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=BF=83=E7=90=86=E5=81=A5=E5=BA=B7=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=EF=BC=9A=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=AA=8C=E8=AF=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/APStuHealthRecords/Form.cshtml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml index 6a9bc7f27..e4844f218 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml @@ -3,25 +3,25 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
-
系
-
+
+
系*
+
-
-
专业
-
+
+
专业*
+
-
-
班级
-
+
+
班级*
+
-
-
学生
-
+
+
学生*
+
-
+
描述
- +
@Html.AppendJsFile("/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.js") From 2b954f83770045c8be2619962f9018dbafda1a20 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 23 Aug 2022 18:06:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?app2.0=20=E6=95=99=E5=B8=88=E8=AF=BE?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.WebApi/Modules/TimeTable.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs index fe3934459..8157c1b0d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs @@ -89,7 +89,7 @@ namespace Learun.Application.WebApi.Modules public Response GetStuLessonInfo(dynamic _) { var param = this.GetReqData(); - var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account,param.StartDate,param.EndDate); + var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account, param.StartDate, param.EndDate); var empNos = lessonInfos.Select(a => a.EmpNo).ToList(); var lessonTerms = arrangeLessonTermIBLL.GetListByEmpNo(empNos); @@ -223,10 +223,10 @@ namespace Learun.Application.WebApi.Modules else if (param.Description == "教师") { //教师 - var empInfo = empInfoIbll.GetAllList().Where(x => x.EmpNo == userInfo.account).FirstOrDefault().EmpNo; + var empInfo = empInfoIbll.GetAllList().Where(x => x.EmpNo == param.Account).FirstOrDefault().EmpNo; if (empInfo != null) { - Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, "", param.EmpNo, ""); + Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, "", param.Account, ""); } }