From 7ad1cafae85af169a0e9ae513c02b37f33e95e1d Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 26 Jun 2025 18:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9C=A8=E5=B2=97=E7=89=B9?=
=?UTF-8?q?=E7=A7=8D=E4=BD=9C=E4=B8=9A=E4=BA=BA=E5=91=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
index f70e9bfe..03dbb842 100644
--- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
@@ -1799,17 +1799,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,
@@ -1824,6 +1829,7 @@ namespace BLL
}).ToList();
return result;
}
+
///
/// 获取在岗特种作业人员数量(异步)
///