20210621
This commit is contained in:
@@ -25,11 +25,11 @@ namespace BLL
|
||||
/// 定义变量
|
||||
/// </summary>
|
||||
private static IQueryable<Model.T_d_facerecord> qq = from x in db.T_d_facerecord
|
||||
orderby x.DateTimeRecord descending
|
||||
orderby x.DateTimeRecord descending
|
||||
select x;
|
||||
private static IQueryable<Model.T_d_validcardevent> qq1 = from x in db.T_d_validcardevent
|
||||
orderby x.RecordDateTime descending
|
||||
select x;
|
||||
private static IQueryable<Model.T_d_validcardevent> qq1= from x in db.T_d_validcardevent
|
||||
orderby x.RecordDateTime descending
|
||||
select x;
|
||||
|
||||
/// <summary>
|
||||
/// 获取分页列表
|
||||
@@ -42,7 +42,7 @@ namespace BLL
|
||||
if (type == "1")
|
||||
{
|
||||
IQueryable<Model.T_d_validcardevent> q1 = qq1.Where(x => x.ProjectId == projectId);
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(startDate))
|
||||
{
|
||||
q1 = q1.Where(e => e.RecordDateTime >= Funs.GetNewDateTime(startDate));
|
||||
@@ -55,8 +55,8 @@ namespace BLL
|
||||
{
|
||||
q1 = from x in q1
|
||||
join y in db.SitePerson_Person on x.IDCardNo equals y.IdentityCard
|
||||
where y.UnitId == unitId
|
||||
select x;
|
||||
where y.UnitId == unitId
|
||||
select x;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(name))
|
||||
{
|
||||
@@ -75,14 +75,14 @@ namespace BLL
|
||||
x.ProjectId,
|
||||
x.EmployName,
|
||||
x.DepartmentID,
|
||||
DepartName = x.DepartmentName,
|
||||
DepartName=x.DepartmentName,
|
||||
x.AreaID,
|
||||
x.AreaName,
|
||||
x.EmployNO,
|
||||
CardID = x.CardNO,
|
||||
DateTimeRecord = x.RecordDateTime,
|
||||
RecordDes = x.RecordAll,
|
||||
InOrOut = (x.InOrOut == 2 ? "出门" : "进门"),
|
||||
CardID=x.CardNO,
|
||||
DateTimeRecord=x.RecordDateTime,
|
||||
RecordDes=x.RecordAll,
|
||||
InOrOut=(x.InOrOut ==2? "出门" : "进门"),
|
||||
};
|
||||
}
|
||||
else
|
||||
@@ -107,9 +107,9 @@ namespace BLL
|
||||
if (!string.IsNullOrEmpty(unitId))
|
||||
{
|
||||
q = from x in q
|
||||
join y in db.SitePerson_Person on x.EmployNO equals y.IdentityCard
|
||||
where y.UnitId == unitId
|
||||
select x;
|
||||
join y in db.SitePerson_Person on x.EmployNO equals y.IdentityCard
|
||||
where y.UnitId == unitId
|
||||
select x;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(name))
|
||||
{
|
||||
@@ -135,7 +135,7 @@ namespace BLL
|
||||
x.CardID,
|
||||
x.DateTimeRecord,
|
||||
x.RecordDes,
|
||||
x.InOrOut,
|
||||
x.InOrOut,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user