修改安全月报
This commit is contained in:
parent
d02a7a1abc
commit
487f11b94a
|
@ -1787,6 +1787,11 @@ namespace FineUIPro.Web.HSSE.Manager
|
||||||
}
|
}
|
||||||
|
|
||||||
#region 2 人力投入情况
|
#region 2 人力投入情况
|
||||||
|
public class spckDtp {
|
||||||
|
public string IdentityCard { get; set; }
|
||||||
|
public string UnitId { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 显示月报告人员投入情况
|
/// 显示月报告人员投入情况
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -1800,10 +1805,11 @@ namespace FineUIPro.Web.HSSE.Manager
|
||||||
int totalSumPersonNum = 0;//总部
|
int totalSumPersonNum = 0;//总部
|
||||||
int totalSumOutPersonNum = 0;//外聘
|
int totalSumOutPersonNum = 0;//外聘
|
||||||
int totalHSEPersonNum = 0;
|
int totalHSEPersonNum = 0;
|
||||||
|
var unitlist = db.SitePerson_Person.Where(x => x.ProjectId == ProjectId);
|
||||||
var spckList = db.SitePerson_Checking.Where(x => x.IntoOutTime >= startTime
|
var spckList = db.SitePerson_Checking.Where(x => x.IntoOutTime >= startTime
|
||||||
&& x.IntoOutTime <= endTime && x.ProjectId == ProjectId && x.IntoOut == "1").Select(x=>new {
|
&& x.IntoOutTime <= endTime && x.ProjectId == ProjectId && x.IntoOut == "1").Select(x=>new spckDtp{
|
||||||
x.UnitId,
|
IdentityCard=x.IdentityCard,
|
||||||
x.IdentityCard
|
UnitId= unitlist.FirstOrDefault(y=>y.IdentityCard==x.IdentityCard).UnitId
|
||||||
});
|
});
|
||||||
|
|
||||||
if (units.Count() > 0)
|
if (units.Count() > 0)
|
||||||
|
|
Loading…
Reference in New Issue