From 9e175daa8b31bfb9ab39d9078e49037c96c816bc Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Thu, 26 Jun 2025 19:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=B2=97=E7=89=B9=E7=A7=8D=E4=BD=9C?=
=?UTF-8?q?=E4=B8=9A=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SUBQHSE/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/SUBQHSE/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SUBQHSE/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
index 56741e1..3737613 100644
--- a/SUBQHSE/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+++ b/SUBQHSE/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
@@ -1724,17 +1724,22 @@ namespace BLL
///
public static List 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()
+ 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) && p.IsUsed == true && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate < DateTime.Now)
+ join su in Funs.DB.Sys_User on q.CompileMan equals su.UserId 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.Sys_User on q.AuditorId equals su1.UserId into su1Group
+ from su1 in su1Group.DefaultIfEmpty()
+ where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 && p.IsUsed == true
select new Model.OfSafetySupervisorsOutput
{
ProjectId = p.ProjectId,