【修改】新生信息统计：增加领军训服装、领床上用品人数；新生信息班级统计：增加班级搜索；

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
             /// 贷款人数
             /// </summary>
             public int LoanNum { get; set; }
+            /// <summary>
+            /// 已领取军训服装人数
+            /// </summary>
+            public int GetMiliClothesNum { get; set; }
+            /// <summary>
+            /// 已领取床上用品人数
+            /// </summary>
+            public int GetBeddingNum { get; set; }
         }
         /// <summary>
         /// 获取列表数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.cshtml

@@ -20,6 +20,9 @@
                     <div class="lr-layout-tool-item">
                         <div id="Grade" type="lrselect" class="lr-select"></div>
                     </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="ClassNo" type="lrselect" class="lr-select"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
                     </div>

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 || {};

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,