Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs

@@ -282,6 +282,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             ViewBag.Grade = academic.AcademicYearShort.Substring(0, 2);
             return View();
         }
+        /// <summary>
+        /// 生源地信息统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticsProvince()
+        {
+            return View();
+        }
         #endregion
 
         #region  获取数据
@@ -1198,6 +1207,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             /// 已领取床上用品人数
             /// </summary>
             public int GetBeddingNum { get; set; }
+            /// <summary>
+            /// 生源地
+            /// </summary>
+            public string Province { get; set; }
+            /// <summary>
+            /// 疆内
+            /// </summary>
+            public string City { get; set; }
         }
         /// <summary>
         /// 获取列表数据
@@ -1260,6 +1277,33 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
         }
 
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetStatisticProvince(string queryJson)
+        {
+            var data = stuInfoFreshIBLL.GetList2(queryJson);
+            var list = data.Where(x => !string.IsNullOrEmpty(x.Province) && !string.IsNullOrEmpty(x.City)).GroupBy(x => new { x.Province, x.City }).Select(x => new StatisticModel
+            {
+                Province = x.Key.Province,
+                City = x.Key.City,
+                TotalNum = x.Count(),
+                InfoNum = x.Count(y => y.IsStudentEdit == true),
+                RegisterNum = x.Count(y => y.RegisterStatus == "1"),
+                PayFeeNum = x.Count(y => y.PayFeeStatus == "1" || y.OnsitePayFeeStatus == "1"),
+                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"),
+                GetMiliClothesNum = x.Count(y => y.GetMiliClothesStatus == "1"),
+                GetBeddingNum = x.Count(y => y.GetBeddingStatus == "1")
+            }).OrderBy(x => x.Province).ThenBy(x => x.City);
+            return Success(list);
+        }
+
         #endregion
 
         #region 上传图片

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

@@ -64,8 +64,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" },
+                    { label: '已领取军训服装人数', name: 'GetMiliClothesNum', width: 120, align: "left", statistics: true  },
+                    { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left", statistics: true  },
                 ],
                 mainId: 'MajorNo',
                 isPage: false,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticIndex.js

@@ -57,8 +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" },
+                    { label: '已领取军训服装人数', name: 'GetMiliClothesNum', width: 120, align: "left", statistics: true },
+                    { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left", statistics: true },
                 ],
                 mainId: 'MajorNo',
                 isPage: false,

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

@@ -0,0 +1,36 @@
+@{
+    ViewBag.Title = "新生信息统计";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-select {
+        width: 150px;
+    }
+</style>
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+
+                    @*<div class="lr-layout-tool-item">
+                        <div id="Grade" 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>*@
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.js

@@ -0,0 +1,89 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-08-08 17:21
+ * 描  述：新生信息统计
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var Grade = $('#Grade').lrselectGet();
+                if (Grade == null || Grade == "") {
+                    learun.alert.warning("请选择年级！");
+                    return;
+                }
+                page.search({ Grade: Grade });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetStatisticProvince',
+                headData: [
+                    {
+                        label: '生源地', name: 'Province', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+                                key: value,
+                                keyId: 'pcode',
+                                callback: function (_data) {
+                                    callback(_data['pname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '疆内', name: 'City', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '总人数', name: 'TotalNum', width: 100, align: "left", statistics: true },
+                    { label: '已完善个人信息人数', name: 'InfoNum', width: 130, align: "left", statistics: true },
+                    { label: '已报到人数', name: 'RegisterNum', width: 100, align: "left", statistics: true },
+                    { label: '已缴费人数', name: 'PayFeeNum', width: 100, align: "left", statistics: true },
+                    { 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: 'GetMiliClothesNum', width: 120, align: "left", statistics: true },
+                    { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left", statistics: true },
+                ],
+                mainId: 'City',
+                isPage: false,
+                sidx: 'Province,City',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1101,6 +1101,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Print.css" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticsProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatusView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\LoanForm.js" />
@@ -7918,6 +7919,7 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Acceptance\FormView.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolCalendar\ScheduleIndex.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\ClearForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticsProvince.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />