xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级

Browse Source
This commit is contained in:
geh
2026-04-09 15:26:39 +08:00
parent 1066f6ae6f
commit ad4f329930
32 changed files with 1556 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/BLL/ZHGL/DataSync/CQMSDataService.cs
+4 -4
View File
@@ -644,8 +644,8 @@ namespace BLL
MaterialInspectionNum = inspectionEquipmentList.Count(),
MaterialInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
UseNum = useNum.Count(),
OKNum = okNum.Count(),
UseNum = useNum.Sum(x => x.UnitsCount ?? 1),
OKNum = okNum.Sum(x => x.UnitsCount ?? 1),
SingleProjectNum = singleProjectNum.Count(),
UnitProjectNum = unitProjectNum.Count(),
SubProjectNum = subProjectNum.Count(),
@@ -724,8 +724,8 @@ namespace BLL
MaterialInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
MaterialInspectionQualifiedNum = inspectionEquipmentList
.Where(x => x.SamplingResult == "1" && x.ProjectId == projectid).Count(),
UseNum = useNum.Count(x => x.ProjectId == projectid),
OKNum = okNum.Count(x => x.ProjectId == projectid),
UseNum = useNum.Where(x => x.ProjectId == projectid).Sum(x => x.UnitsCount ?? 1),
OKNum = okNum.Where(x => x.ProjectId == projectid).Sum(x => x.UnitsCount ?? 1),
SingleProjectNum = singleProjectNum.Count(x => x.ProjectId == projectid),
UnitProjectNum = unitProjectNum.Count(x => x.ProjectId == projectid),
SubProjectNum = subProjectNum.Count(x => x.ProjectId == projectid),
SUBQHSE/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
+2
View File
@@ -1415,6 +1415,7 @@ namespace BLL
AwardType = x.AwardType,
AwardLevel = x.AwardLevel,
AwardingUnit = x.AwardingUnit,
AwardYear = x.AwardYear,
}).Take(pushNum).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0)
@@ -1484,6 +1485,7 @@ namespace BLL
AwardName = x.AwardName,
AwardLevel = x.AwardLevel,
AwardingUnit = x.AwardingUnit,
AwardYear = x.AwardYear,
}).ToList();
if (items.Count() > 0)