1
This commit is contained in:
@@ -646,7 +646,7 @@ namespace BLL
|
||||
var inspectionLotNum = await inspectionLotNumTask;
|
||||
|
||||
var constructSolutionList = await constructSolutionTask;
|
||||
var comprehensiveMajorPlanList = await comprehensiveMajorPlanTask;
|
||||
var comprehensiveMajorPlanList = await comprehensiveMajorPlanTask;
|
||||
var cqmsProblemList = await cqmsProblemTask;
|
||||
var cqmsBranchMajorCheckList = await cqmsBranchMajorCheckTask;
|
||||
var cqmsCompanyMajorCheckList = await cqmsCompanyMajorCheckTask;
|
||||
@@ -704,7 +704,7 @@ namespace BLL
|
||||
SubdivisionalWorksNum = subdivisionalWorksNum.Count(),
|
||||
InspectionLotNum = inspectionLotNum.Sum(x => x.Sum),
|
||||
|
||||
ConstructSolutionNum = constructSolutionList.Count(),
|
||||
ConstructSolutionNum = constructSolutionList.Count() + comprehensiveMajorPlanList.Count(),
|
||||
ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.ApprovalDate.HasValue).Count(),
|
||||
ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(),//
|
||||
SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(),
|
||||
@@ -774,7 +774,7 @@ namespace BLL
|
||||
SubdivisionalWorksNum = subdivisionalWorksNum.Count(x => x.ProjectId == projectid),
|
||||
InspectionLotNum = inspectionLotNum.Where(x => x.ProjectId == projectid).Sum(x => x.Sum),
|
||||
|
||||
ConstructSolutionNum = constructSolutionList.Count(x => x.ProjectId == projectid),
|
||||
ConstructSolutionNum = constructSolutionList.Count(x => x.ProjectId == projectid) + comprehensiveMajorPlanList.Count(x => x.ProjectId == projectid),
|
||||
ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.ApprovalDate.HasValue && x.ProjectId == projectid).Count(),
|
||||
ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(x => x.ProjectId == projectid),
|
||||
SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(x => x.ProjectId == projectid),
|
||||
|
||||
Reference in New Issue
Block a user