lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
夏菊
2025-06-26 22:38:49 +08:00
parent 3680941218
commit 22c9f4744e
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
+20 -11
View File
@@ -945,7 +945,7 @@ namespace BLL
var result = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
join m in Funs.DB.Base_WorkPost on x.WorkPostId equals m.WorkPostId
where x.ProjectId == projectid && m.PostType == Const.PostType_2 && x.IsUsed == true && (y.LimitDate == null || y.LimitDate < DateTime.Now)
where x.ProjectId == projectid && m.PostType == Const.PostType_2 && x.IsUsed == true
select x).Count();
return result;
}
@@ -1318,15 +1318,21 @@ namespace BLL
/// <returns></returns>
public static int GetUseEquipmentNum(string projectid)
{
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
where y.ProjectId == projectid && x.IsUsed == true
var result = (from x in Funs.DB.QualityAudit_EquipmentQuality
where x.ProjectId == projectid
select x).Count() +
(from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
.GeneralEquipmentInId
where y.ProjectId == projectid && x.IsUsed == true
(from x in Funs.DB.QualityAudit_GeneralEquipmentQuality
where x.ProjectId == projectid
select x).Count();
//var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
// join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
// where y.ProjectId == projectid && x.IsUsed == true
// select x).Count() +
// (from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
// join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
// .GeneralEquipmentInId
// where y.ProjectId == projectid && x.IsUsed == true
// select x).Count();
return result;
}
@@ -1336,10 +1342,13 @@ namespace BLL
/// <returns></returns>
public static int GetSpecialEquipmentNum(string projectid)
{
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
where y.ProjectId == projectid && x.IsUsed == true
var result = (from x in Funs.DB.QualityAudit_EquipmentQuality
where x.ProjectId == projectid
select x).Count();
//var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
// join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
// where y.ProjectId == projectid && x.IsUsed == true
// select x).Count();
return result;
}