From c5ffa080e11a23a91542cf80a1dc4462ada67a52 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Mon, 11 Jul 2022 10:51:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=96=B0?= =?UTF-8?q?=E7=94=9F=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A2=86=E5=86=9B=E8=AE=AD=E6=9C=8D=E8=A3=85=E3=80=81?= =?UTF-8?q?=E9=A2=86=E5=BA=8A=E4=B8=8A=E7=94=A8=E5=93=81=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=EF=BC=9B=E6=96=B0=E7=94=9F=E4=BF=A1=E6=81=AF=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=9A=E5=A2=9E=E5=8A=A0=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuInfoFreshController.cs | 16 ++++++++++++++-- .../StuInfoFresh/StatisticClassIndex.cshtml | 3 +++ .../Views/StuInfoFresh/StatisticClassIndex.js | 15 +++++++++++---- .../Views/StuInfoFresh/StatisticIndex.js | 6 +++++- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index b287f0901..ffe6bdecd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -1099,7 +1099,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers GetKeyNum = x.Count(y => y.GetKeyStatus == "1"), GetCardNum = x.Count(y => y.GetCardStatus == "1"), CollectFileNum = x.Count(y => y.CollectFileStatus == "1"), - LoanNum = x.Count(y => y.StudentLoanStatus == "1") + LoanNum = x.Count(y => y.StudentLoanStatus == "1"), + GetMiliClothesNum = x.Count(y => y.GetMiliClothesStatus == "1"), + GetBeddingNum = x.Count(y => y.GetBeddingStatus == "1") }).OrderBy(x => x.MajorNo); //var aa = new StatisticModel @@ -1143,7 +1145,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers GetKeyNum = x.Count(y => y.GetKeyStatus == "1"), GetCardNum = x.Count(y => y.GetCardStatus == "1"), CollectFileNum = x.Count(y => y.CollectFileStatus == "1"), - LoanNum = x.Count(y => y.StudentLoanStatus == "1") + LoanNum = x.Count(y => y.StudentLoanStatus == "1"), + GetMiliClothesNum = x.Count(y => y.GetMiliClothesStatus == "1"), + GetBeddingNum = x.Count(y => y.GetBeddingStatus == "1") }).OrderBy(x => x.MajorNo).ThenBy(x => x.ClassNo); return Success(list); } @@ -1186,6 +1190,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// 贷款人数 /// public int LoanNum { get; set; } + /// + /// 已领取军训服装人数 + /// + public int GetMiliClothesNum { get; set; } + /// + /// 已领取床上用品人数 + /// + public int GetBeddingNum { get; set; } } /// /// 获取列表数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.cshtml index 713285640..263d3170c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.cshtml @@ -20,6 +20,9 @@
+
+
+
 查询
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.js index 78d35159f..739f40fff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.js @@ -8,6 +8,7 @@ var selectedRow; var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; + var ClassNo = ""; var page = { init: function () { page.initGird(); @@ -22,7 +23,9 @@ var bootstrap = function ($, learun) { learun.alert.warning("请选择年级！"); return; } - page.search({ Grade: Grade }); + ClassNo = $('#ClassNo').lrselectGet(); + + page.search({ Grade: Grade, ClassNo: ClassNo }); }); // 刷新 $('#lr_refresh').on('click', function () { @@ -41,9 +44,11 @@ var bootstrap = function ($, learun) { text: 'text' }); $('#Grade').lrselectSet(Grade); + //班级 + $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); }, initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetStatisticListOfClass', headData: [ { label: '年级', name: 'Grade', width: 80, align: "left" }, @@ -58,14 +63,16 @@ var bootstrap = function ($, learun) { { label: '贷款人数', name: 'LoanNum', width: 100, align: "left", statistics: true }, { label: '已领取钥匙人数', name: 'GetKeyNum', width: 100, align: "left", statistics: true }, { label: '已领取校园卡人数', name: 'GetCardNum', width: 120, align: "left", statistics: true }, - { label: '已收取档案人数', name: 'CollectFileNum', width: 100, align: "left", statistics: true }, + { label: '已收取档案人数', name: 'CollectFileNum', width: 100, align: "left", statistics: true }, + { label: '已领取军训服装人数', name: 'GetMiliClothesNum', width: 120, align: "left" }, + { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left" }, ], mainId: 'MajorNo', isPage: false, sidx: 'MajorNo,ClassNo', sord: 'asc', }); - page.search({ Grade: Grade }); + page.search({ Grade: Grade, ClassNo: ClassNo }); }, search: function (param) { param = param || {}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticIndex.js index 0312eeed9..e6e2a2631 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticIndex.js @@ -43,7 +43,7 @@ var bootstrap = function ($, learun) { $('#Grade').lrselectSet(Grade); }, initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetStatisticList', headData: [ { label: '年级', name: 'Grade', width: 80, align: "left" }, @@ -57,6 +57,8 @@ var bootstrap = function ($, learun) { { label: '已领取钥匙人数', name: 'GetKeyNum', width: 100, align: "left", statistics: true }, { label: '已领取校园卡人数', name: 'GetCardNum', width: 120, align: "left", statistics: true }, { label: '已收取档案人数', name: 'CollectFileNum', width: 100, align: "left", statistics: true }, + { label: '已领取军训服装人数', name: 'GetMiliClothesNum', width: 120, align: "left" }, + { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left" }, ], mainId: 'MajorNo', isPage: false, @@ -78,6 +80,8 @@ var bootstrap = function ($, learun) { { label: '已领取钥匙人数', name: 'GetKeyNum', width: 100, align: "left" }, { label: '已领取校园卡人数', name: 'GetCardNum', width: 120, align: "left" }, { label: '已收取档案人数', name: 'CollectFileNum', width: 100, align: "left" }, + { label: '已领取军训服装人数', name: 'GetMiliClothesNum', width: 120, align: "left" }, + { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left" }, ], mainId: 'ClassNo', isPage: false,