@@ -56,9 +56,15 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers | |||||
public ActionResult GetList(string pagination, string queryJson) | public ActionResult GetList(string pagination, string queryJson) | ||||
{ | { | ||||
Pagination paginationobj = pagination.ToObject<Pagination>(); | 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 | #endregion | ||||
@@ -14,12 +14,12 @@ | |||||
<div id="multiple_condition_query"> | <div id="multiple_condition_query"> | ||||
<div class="lr-query-formcontent"> | <div class="lr-query-formcontent"> | ||||
<div class="col-xs-6 lr-form-item" id="TCNameDiv"> | <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> | ||||
<div class="col-xs-6 lr-form-item"> | <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> | ||||
<div class="col-xs-12 lr-form-item"> | <div class="col-xs-12 lr-form-item"> | ||||
<div class="lr-form-item-title">职工号/学号</div> | <div class="lr-form-item-title">职工号/学号</div> | ||||
@@ -146,7 +146,7 @@ var bootstrap = function ($, learun) { | |||||
url: top.$.rootUrl + '/LR_Desktop/LoginStatistics/GetList', | url: top.$.rootUrl + '/LR_Desktop/LoginStatistics/GetList', | ||||
headData: headData, | headData: headData, | ||||
mainId: 'account', | mainId: 'account', | ||||
isPage: false, | |||||
isPage: true, | |||||
}); | }); | ||||
//page.search(); | //page.search(); | ||||
}, | }, | ||||
@@ -161,7 +161,6 @@ var bootstrap = function ($, learun) { | |||||
} else { | } else { | ||||
param.Month = date.getMonth() + 1; | param.Month = date.getMonth() + 1; | ||||
} | } | ||||
console.log(param); | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | ||||
} | } | ||||
}; | }; | ||||
@@ -17,11 +17,11 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop | |||||
/// <param name="pagination">分页参数</param> | /// <param name="pagination">分页参数</param> | ||||
/// <param name="queryJson">查询参数</param> | /// <param name="queryJson">查询参数</param> | ||||
/// <returns></returns> | /// <returns></returns> | ||||
public IEnumerable<LoginStatisticsEntity> GetList(string queryJson) | |||||
public IEnumerable<LoginStatisticsEntity> GetList(Pagination paginationobj,string queryJson) | |||||
{ | { | ||||
try | try | ||||
{ | { | ||||
return loginStatisticsService.GetList( queryJson); | |||||
return loginStatisticsService.GetList(paginationobj,queryJson); | |||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||
{ | { | ||||
@@ -13,7 +13,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop | |||||
/// </summary> | /// </summary> | ||||
/// <param name="queryJson">查询参数</param> | /// <param name="queryJson">查询参数</param> | ||||
/// <returns></returns> | /// <returns></returns> | ||||
IEnumerable<LoginStatisticsEntity> GetList(string queryJson); | |||||
IEnumerable<LoginStatisticsEntity> GetList(Pagination paginationobj,string queryJson); | |||||
#endregion | #endregion | ||||
@@ -18,7 +18,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop | |||||
/// <param name="pagination">查询参数</param> | /// <param name="pagination">查询参数</param> | ||||
/// <param name="queryJson">查询参数</param> | /// <param name="queryJson">查询参数</param> | ||||
/// <returns></returns> | /// <returns></returns> | ||||
public IEnumerable<LoginStatisticsEntity> GetList(string queryJson) | |||||
public IEnumerable<LoginStatisticsEntity> GetList(Pagination paginationobj, string queryJson) | |||||
{ | { | ||||
try | 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]) | 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(); | ) TBL " + whereStr.ToString(); | ||||
return this.BaseRepository().FindList<LoginStatisticsEntity>(str, dp); | |||||
return this.BaseRepository().FindList<LoginStatisticsEntity>(str, dp, paginationobj); | |||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||
{ | { | ||||