From 3b62f059b268d7f24439114f15ddb3f0ef224159 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 23 Sep 2022 15:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=AC=A1=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/LoginStatisticsController.cs         | 12 +++++++++---
 .../LR_Desktop/Views/LoginStatistics/Index.cshtml    |  8 ++++----
 .../Areas/LR_Desktop/Views/LoginStatistics/Index.js  |  3 +--
 .../LR_Desktop/LoginStatistics/LoginStatisticsBLL.cs |  4 ++--
 .../LoginStatistics/LoginStatisticsIBLL.cs           |  2 +-
 .../LoginStatistics/LoginStatisticsService.cs        |  4 ++--
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/LoginStatisticsController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/LoginStatisticsController.cs
index 2c7962e56..500645613 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/LoginStatisticsController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/LoginStatisticsController.cs	
@@ -56,9 +56,15 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         public ActionResult GetList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var list = loginStatisticsIBLL.GetList(queryJson).ToList();
-            var data = new { rows = list };
-            return Success(list);
+            var list = loginStatisticsIBLL.GetList(paginationobj,queryJson).ToList();
+            var jsonData = new
+            {
+                rows = list,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
         }
         #endregion
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.cshtml
index 8173c012b..a8e1d7c37 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.cshtml	
@@ -14,12 +14,12 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-6 lr-form-item" id="TCNameDiv">
-                                    <div class="lr-form-item-title">年度<font face="宋体">*</font></div>
-                                    <div id="Year" isvalid="yes" checkexpession="NotNull" ></div>
+                                    <div class="lr-form-item-title">年度</div>
+                                    <div id="Year"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">月份<font face="宋体">*</font></div>
-                                    <div id="Month" isvalid="yes" checkexpession="NotNull" ></div>
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="Month"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">职工号/学号</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.js
index cf52fa9a5..c18a46508 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/LoginStatistics/Index.js	
@@ -146,7 +146,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_Desktop/LoginStatistics/GetList',
                 headData: headData,
                 mainId: 'account',
-                isPage: false,
+                isPage: true,
             });
             //page.search();
         },
@@ -161,7 +161,6 @@ var bootstrap = function ($, learun) {
             } else {
                 param.Month = date.getMonth() + 1;
             }
-            console.log(param);
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsBLL.cs
index 21e11b334..2454a5e8c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsBLL.cs	
@@ -17,11 +17,11 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         /// <param name="pagination">分页参数</param>
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
-        public IEnumerable<LoginStatisticsEntity> GetList(string queryJson)
+        public IEnumerable<LoginStatisticsEntity> GetList(Pagination paginationobj,string queryJson)
         {
             try
             {
-                return loginStatisticsService.GetList( queryJson);
+                return loginStatisticsService.GetList(paginationobj,queryJson);
             }
             catch (Exception ex)
             {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsIBLL.cs
index 146436e9f..5838d8de4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsIBLL.cs	
@@ -13,7 +13,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         /// </summary>
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
-        IEnumerable<LoginStatisticsEntity> GetList(string queryJson);
+        IEnumerable<LoginStatisticsEntity> GetList(Pagination paginationobj,string queryJson);
         #endregion
         
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsService.cs
index acc2e7abb..5046ee202 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/LoginStatistics/LoginStatisticsService.cs	
@@ -18,7 +18,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         /// <param name="pagination">查询参数</param>
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
-        public IEnumerable<LoginStatisticsEntity> GetList(string queryJson)
+        public IEnumerable<LoginStatisticsEntity> GetList(Pagination paginationobj, string queryJson)
         {
             try
             {
@@ -84,7 +84,7 @@ isnull([25],0) as num25,isnull([26],0) as num26,isnull([27],0) as num27,isnull([
                 (
                     SUM(num) for daydata in([1],[2],[3],[4],[5],[6],[7],[8],[9],[10],[11],[12],[13],[14],[15],[16],[17],[18],[19],[20],[21],[22],[23],[24],[25],[26],[27],[28],[29],[30],[31])
                     ) TBL  " + whereStr.ToString();
-                return this.BaseRepository().FindList<LoginStatisticsEntity>(str, dp);
+                return this.BaseRepository().FindList<LoginStatisticsEntity>(str, dp, paginationobj);
             }
             catch (Exception ex)
             {