根据条件获取人员出入场记录接口取消项目代号必填,返回增加项目代号,项目名称,人员身份证号信息。
This commit is contained in:
@@ -1117,14 +1117,17 @@ namespace BLL
|
||||
var query = from x in db.SitePerson_PersonInOut
|
||||
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
|
||||
join z in db.Base_Project on x.ProjectId equals z.ProjectId
|
||||
where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime && z.ProjectCode.Contains(filter.ProjectCode)
|
||||
where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime
|
||||
select new Model.PersonInOutItem
|
||||
{
|
||||
PersonId = x.PersonId,
|
||||
PersonName = y.PersonName,
|
||||
ProjectId = x.ProjectId,
|
||||
ProjectCode=z.ProjectCode,
|
||||
ProjectName=z.ProjectName,
|
||||
UnitId = y.UnitId,
|
||||
UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
|
||||
IdentityCard=x.IdentityCard,
|
||||
WorkPostId = y.WorkPostId,
|
||||
WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
|
||||
IsIn = x.IsIn,
|
||||
@@ -1142,7 +1145,11 @@ namespace BLL
|
||||
{
|
||||
query = query.Where(x => x.UnitName.Contains(filter.UnitName));
|
||||
}
|
||||
|
||||
// 项目代号过滤(模糊查询)
|
||||
if (!string.IsNullOrEmpty(filter.ProjectCode))
|
||||
{
|
||||
query = query.Where(x => x.ProjectCode.Contains(filter.ProjectCode));
|
||||
}
|
||||
// 人员姓名过滤(模糊查询)
|
||||
if (!string.IsNullOrEmpty(filter.PersonName))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user