lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20210812

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/DoorProject/getController.cs
+1 -2
View File
@@ -22,12 +22,11 @@ namespace WebAPI.Controllers
/// <param name="appId"></param>
/// <param name="appSecret"></param>
/// <returns></returns>
[HttpGet]
[HttpGet]
public object token(string projectId, string appId, string appSecret)
{
return new
{
code = 0,
data = new { token = Const.sysglyId },
tokenExpires = Funs.ConvertDateTimeToInt32(DateTime.Now.AddMonths(1)),
};
SGGL/WebAPI/Controllers/DoorProject/uploadController.cs
+4 -4
View File
@@ -88,7 +88,7 @@ namespace WebAPI.Controllers
APIPersonService.getPersonInOut(facerecord.ProjectId, facerecord.EmployNO, isIn, facerecord.DateTimeRecord.Value);
}
}
responeData.code = 0;
}
}
else
@@ -98,7 +98,7 @@ namespace WebAPI.Controllers
}
catch (Exception ex)
{
responeData.code = -1;
responeData.code = 0;
responeData.message = ex.Message;
}
@@ -118,7 +118,7 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
responeData.code = 0;
if (person != null )
{
responeData.message="success";
@@ -130,7 +130,7 @@ namespace WebAPI.Controllers
}
catch (Exception ex)
{
responeData.code = -1;
responeData.code = 0;
responeData.message = ex.Message;
}
SGGL/WebAPI/Controllers/PersonController.cs
+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)