diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index d98a37e8..5971df32 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -17019,7 +17019,7 @@
-
+
diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs
index 38334cfc..67b01643 100644
--- a/SGGL/WebAPI/Controllers/PersonController.cs
+++ b/SGGL/WebAPI/Controllers/PersonController.cs
@@ -113,7 +113,7 @@ namespace WebAPI.Controllers
/// 页码（从1开始）
/// 是否返回全部数据
///
- public Model.ResponeData getPersonByFilter([FromUri] Model.ProjectPersonInput filter, int? pagesize = 15, int? pageindex = 1, bool ? returnAll = false)
+ public Model.ResponeData getPersonByFilter([FromUri] Model.ProjectPersonInput filter, int? pagesize = 15, int? pageindex = 1, bool? returnAll = false)
{
var responeData = new Model.ResponeData();
try
@@ -383,12 +383,12 @@ namespace WebAPI.Controllers
/// 培训类型ID(可为空)
/// 分页
///
- public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, int pageIndex)
+ public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, int pageIndex, string startDate, string endDate)
{
var responeData = new Model.ResponeData();
try
{
- var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId,null).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
+ var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId, null, startDate, endDate).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0)
{
@@ -414,12 +414,12 @@ namespace WebAPI.Controllers
///
///
///
- public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId,string name, int pageIndex)
+ public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, string name, int pageIndex)
{
var responeData = new Model.ResponeData();
try
{
- var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId,name).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
+ var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId, name).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0)
{
@@ -709,7 +709,7 @@ namespace WebAPI.Controllers
IdentityCard = idCard,
IsIn = isIn == 1 ? true : false,
ChangeTime = changeTime,
- InOutWay = Const.InOutWay_1
+ InOutWay = Const.InOutWay_1
};
PersonInOutService.AddPersonInOut(newInOut);
@@ -818,7 +818,7 @@ namespace WebAPI.Controllers
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard
where x.ProjectId == projectId && !x.ExchangeTime.HasValue
- && x.States == Const.ProjectPersonStates_1 && x.CardNo.Length> 5 && persons.PhotoUrl != null
+ && x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null
select new
{
x.PersonId,
@@ -837,7 +837,7 @@ namespace WebAPI.Controllers
TrainRecord = APIPersonService.getStrTrainRecordByPersonId(x.PersonId),
x.ExchangeTime,
x.ExchangeTime2,
- PhotoUrl=persons.PhotoUrl.Replace('\\', '/'),
+ PhotoUrl = persons.PhotoUrl.Replace('\\', '/'),
}).Take(200).ToList();
}
catch (Exception ex)
@@ -852,15 +852,15 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
- // var trainingIds = Funs.DB.EduTrain_TrainRecord.Where(x => projectId == projectId).Select(x => x.TrainingId).ToList();
- // var personIds = Funs.DB.EduTrain_TrainRecordDetail.Where(x => trainingIds.Contains(x.TrainingId)).Select(x=>x.PersonId).ToList(); ;
+ // var trainingIds = Funs.DB.EduTrain_TrainRecord.Where(x => projectId == projectId).Select(x => x.TrainingId).ToList();
+ // var personIds = Funs.DB.EduTrain_TrainRecordDetail.Where(x => trainingIds.Contains(x.TrainingId)).Select(x=>x.PersonId).ToList(); ;
responeData.data = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
- join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard
+ join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard
join traindetail in Funs.DB.Training_TestRecord on x.PersonId equals traindetail.TestManId
- where x.ProjectId == projectId && !x.ExchangeTime.HasValue && traindetail.ProjectId == projectId
- && x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null && traindetail.TestScores >= 60
+ where x.ProjectId == projectId && !x.ExchangeTime.HasValue && traindetail.ProjectId == projectId
+ && x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null && traindetail.TestScores >= 60
// where personIds.Contains(x.PersonId)
select new
{
@@ -881,13 +881,13 @@ namespace WebAPI.Controllers
persons.Address,
TrainRecord = APIPersonService.getStrTrainingTestRecordByPersonId(x.PersonId),
x.ExchangeTime,
- x.ExchangeTime2,
+ x.ExchangeTime2,
x.AuditorDate,
PhotoUrl = persons.PhotoUrl.Replace('\\', '/'),
IsUsed = x.States == Const.ProjectPersonStates_1 ? 1 : 0,
- BlackList = 0
+ BlackList = 0
}).Take(200).ToList();
-
+
}
catch (Exception ex)
{
@@ -965,7 +965,7 @@ namespace WebAPI.Controllers
///
///
///
- public Model.ResponeData getUpdatePersonExchangeTime(string projectId,string idCard, string type)
+ public Model.ResponeData getUpdatePersonExchangeTime(string projectId, string idCard, string type)
{
var responeData = new Model.ResponeData();
try
@@ -978,9 +978,9 @@ namespace WebAPI.Controllers
else
{
responeData.code = 1;
- responeData.message = "当前项目不存在身份证为：" + idCard.ToString() +"的人员！";
+ responeData.message = "当前项目不存在身份证为：" + idCard.ToString() + "的人员！";
}
-
+
}
catch (Exception ex)
{
@@ -1024,7 +1024,7 @@ namespace WebAPI.Controllers
#endregion
-
+
#region 获取人员信息出入场记录-查询
@@ -1113,7 +1113,7 @@ namespace WebAPI.Controllers
responeData.code = 0;
responeData.message = "StartTime和EndTime为必填参数！";
return responeData;
- }
+ }
// 验证时间范围
if (filter.StartTime > filter.EndTime)
{