This commit is contained in:
2021-08-12 10:45:31 +08:00
parent 16bd4f1767
commit bacbffb714
31 changed files with 23671 additions and 53 deletions
+4 -12
View File
@@ -966,12 +966,8 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
var getDataList = APIPersonService.getPersonInOutList(projectId, userUnitId, unitId, workPostId, strParam, startTime, endTime);
int pageCount = getDataList.Count();
if (pageCount > 0 && pageIndex > 0)
{
getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
}
var getDataList = APIPersonService.getPersonInOutList(projectId, userUnitId, unitId, workPostId, strParam, startTime, endTime, pageIndex);
int pageCount = APIPersonService.getPersonInOutListCount;
responeData.data = new { pageCount, getDataList };
}
catch (Exception ex)
@@ -997,12 +993,8 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
var getDataList = APIPersonService.getPersonInOutListByPersonId(personId, startTime, endTime);
int pageCount = getDataList.Count();
if (pageCount > 0 && pageIndex > 0)
{
getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
}
var getDataList = APIPersonService.getPersonInOutListByPersonId(personId, startTime, endTime, pageIndex);
int pageCount = APIPersonService.getPersonInOutListByPersonIdCount;
responeData.data = new { pageCount, getDataList };
}
catch (Exception ex)