This commit is contained in:
2025-06-27 14:31:50 +08:00
parent fded5d4485
commit e12e7ed448
13 changed files with 832 additions and 26 deletions
+39 -9
View File
@@ -4191,19 +4191,48 @@ namespace BLL
/// <returns></returns>
public static List<Model.OfSafetySupervisorsOutput> GetQualityPersonNum()
{
var result = (from x in Funs.DB.QualityAudit_PersonQuality
join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId into pGroup
from p in pGroup.DefaultIfEmpty()
join pp in Funs.DB.Person_Persons on p.PersonId equals pp.PersonId into ppGroup
from pp in ppGroup.DefaultIfEmpty()
//var result = (from x in Funs.DB.QualityAudit_PersonQuality
// join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId into pGroup
// from p in pGroup.DefaultIfEmpty()
// join pp in Funs.DB.Person_Persons on p.PersonId equals pp.PersonId into ppGroup
// from pp in ppGroup.DefaultIfEmpty()
// join bp in Funs.DB.Base_Project on p.ProjectId equals bp.ProjectId into bpGroup
// from bp in bpGroup.DefaultIfEmpty()
// join u in Funs.DB.Base_Unit on p.UnitId equals u.UnitId into uGroup
// from u in uGroup.DefaultIfEmpty()
// join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
// join m in Funs.DB.Base_WorkPost on p.WorkPostId equals m.WorkPostId into mGroup
// from m in mGroup.DefaultIfEmpty()
// where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate < DateTime.Now)
// select new Model.OfSafetySupervisorsOutput
// {
// ProjectId = p.ProjectId,
// ProjectName = bp.ProjectName,
// UnitId = u.UnitId,
// UnitName = u.UnitName,
// Name = p.PersonName,
// Sex = pp.Sex == null ? "" : (pp.Sex == "1" ? "男" : "女"),
// IdentityCard = p.IdentityCard,
// WorkPostName = m.WorkPostName == null ? "" : m.WorkPostName,
// Phone = pp.Telephone
// }).ToList();
//return result;
var result = (from p in Funs.DB.SitePerson_Person
join bp in Funs.DB.Base_Project on p.ProjectId equals bp.ProjectId into bpGroup
from bp in bpGroup.DefaultIfEmpty()
join u in Funs.DB.Base_Unit on p.UnitId equals u.UnitId into uGroup
from u in uGroup.DefaultIfEmpty()
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
join q in Funs.DB.QualityAudit_PersonQuality on p.PersonId equals q.PersonId into qGroup
from q in qGroup.DefaultIfEmpty()
join m in Funs.DB.Base_WorkPost on p.WorkPostId equals m.WorkPostId into mGroup
from m in mGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate < DateTime.Now)
join su in Funs.DB.Person_Persons on q.CompileMan equals su.PersonId into suGroup
from su in suGroup.DefaultIfEmpty()
join bc in Funs.DB.Base_Certificate on q.CertificateId equals bc.CertificateId into bcGroup
from bc in bcGroup.DefaultIfEmpty()
join su1 in Funs.DB.Person_Persons on q.AuditorId equals su1.PersonId into su1Group
from su1 in su1Group.DefaultIfEmpty()
where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2
select new Model.OfSafetySupervisorsOutput
{
ProjectId = p.ProjectId,
@@ -4211,12 +4240,13 @@ namespace BLL
UnitId = u.UnitId,
UnitName = u.UnitName,
Name = p.PersonName,
Sex = pp.Sex == null ? "" : (pp.Sex == "1" ? "男" : "女"),
Sex = su.Sex == null ? "" : (su.Sex == "1" ? "男" : "女"),
IdentityCard = p.IdentityCard,
WorkPostName = m.WorkPostName == null ? "" : m.WorkPostName,
Phone = pp.Telephone
Phone = su.Telephone
}).ToList();
return result;
}
/// <summary>
/// 获取在岗特种作业人员数量(异步)