zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APIPersonQualityService.cs
+3 -3
View File
@@ -168,7 +168,7 @@ namespace BLL
join z in db.Base_WorkPost on x.WorkPostId equals z.WorkPostId
join y in db.QualityAudit_PersonQuality on x.PersonId equals y.PersonId into jonPerson
from y in jonPerson.DefaultIfEmpty()
where x.ProjectId == projectId && z.PostType == Const.PostType_2 && x.IsUsed == true && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
where x.ProjectId == projectId && z.PostType == Const.PostType_2 && x.IsUsed == 1 && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
orderby x.CardNo
select new Model.PersonQualityItem
{
@@ -210,7 +210,7 @@ namespace BLL
join z in db.Base_WorkPost on x.WorkPostId equals z.WorkPostId
join y in db.QualityAudit_SafePersonQuality on x.PersonId equals y.PersonId into jonPerson
from y in jonPerson.DefaultIfEmpty()
where x.ProjectId == projectId && z.IsHsse == true && x.IsUsed == true && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
where x.ProjectId == projectId && z.IsHsse == true && x.IsUsed == 1 && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
orderby y.LimitDate
select new Model.PersonQualityItem
{
@@ -252,7 +252,7 @@ namespace BLL
join z in db.Base_WorkPost on x.WorkPostId equals z.WorkPostId
join y in db.QualityAudit_EquipmentPersonQuality on x.PersonId equals y.PersonId into jonPerson
from y in jonPerson.DefaultIfEmpty()
where x.ProjectId == projectId && z.PostType == Const.PostType_5 && x.IsUsed == true && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
where x.ProjectId == projectId && z.PostType == Const.PostType_5 && x.IsUsed == 1 && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
orderby y.LimitDate
select new Model.PersonQualityItem
{