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(); - 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 @@
-
年度*
-
+
年度
+
-
月份*
-
+
月份
+
职工号/学号
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 /// 分页参数 /// 查询参数 /// - public IEnumerable GetList(string queryJson) + public IEnumerable 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 /// /// 查询参数 /// - IEnumerable GetList(string queryJson); + IEnumerable 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 /// 查询参数 /// 查询参数 /// - public IEnumerable GetList(string queryJson) + public IEnumerable 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(str, dp); + return this.BaseRepository().FindList(str, dp, paginationobj); } catch (Exception ex) {