diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs index a1a049cc..ab1517f0 100644 --- a/SGGL/WebAPI/Controllers/PersonController.cs +++ b/SGGL/WebAPI/Controllers/PersonController.cs @@ -1,4 +1,5 @@ using BLL; +using Model; using System; using System.Configuration; using System.IO; @@ -808,15 +809,17 @@ 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 - where x.ProjectId == projectId && !x.ExchangeTime.HasValue + join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard + join traindetail in Funs.DB.EduTrain_TrainRecordDetail on x.PersonId equals traindetail.PersonId + join train in Funs.DB.EduTrain_TrainRecord on traindetail.TrainingId equals train.TrainingId + where x.ProjectId == projectId && !x.ExchangeTime.HasValue && train.ProjectId == projectId && x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null - where personIds.Contains(x.PersonId) + // where personIds.Contains(x.PersonId) select new { x.PersonId,