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

1

This commit is contained in:
夏菊 2025-06-19 21:09:22 +08:00
parent 8ca97d0c9a
commit db4323726c
2 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
View File

@ -704,7 +704,7 @@ namespace BLL
SubdivisionalWorksNum = subdivisionalWorksNum.Count(), SubdivisionalWorksNum = subdivisionalWorksNum.Count(),
InspectionLotNum = inspectionLotNum.Sum(x => x.Sum), InspectionLotNum = inspectionLotNum.Sum(x => x.Sum),
ConstructSolutionNum = constructSolutionList.Count(), ConstructSolutionNum = constructSolutionList.Count() + comprehensiveMajorPlanList.Count(),
ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.ApprovalDate.HasValue).Count(), ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.ApprovalDate.HasValue).Count(),
ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(),// ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(),//
SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(), SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(),
@ -774,7 +774,7 @@ namespace BLL
SubdivisionalWorksNum = subdivisionalWorksNum.Count(x => x.ProjectId == projectid), SubdivisionalWorksNum = subdivisionalWorksNum.Count(x => x.ProjectId == projectid),
InspectionLotNum = inspectionLotNum.Where(x => x.ProjectId == projectid).Sum(x => x.Sum), 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(), ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.ApprovalDate.HasValue && x.ProjectId == projectid).Count(),
ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(x => x.ProjectId == projectid), ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(x => x.ProjectId == projectid),
SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(x => x.ProjectId == projectid), SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(x => x.ProjectId == projectid),

52
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
View File

@ -503,9 +503,9 @@ namespace BLL
} }
if (cQMSDateType == CQMSDateType.ConstructSolution || cQMSDateType == CQMSDateType.All) if (cQMSDateType == CQMSDateType.ConstructSolution || cQMSDateType == CQMSDateType.All)
{ {
table.ConstructSolutionNum = GetConstructSolutionNum(projectid); table.ConstructSolutionNum = GetConstructSolutionNum(projectid) + GetComprehensive_MajorPlanApprovalNum(projectid);
table.ConstructSolutionProjectApproveNum = GetConstructSolutionProjectApproveNum(projectid); table.ConstructSolutionProjectApproveNum = GetConstructSolutionProjectApproveNum(projectid);
table.ConstructSolutionUnitApproveNum = GetConstructSolutionUnitApproveNum(projectid); table.ConstructSolutionUnitApproveNum = GetComprehensive_MajorPlanApprovalNum(projectid);
} }
if (cQMSDateType == CQMSDateType.SpecialEquipmentAndDesignDetails || cQMSDateType == CQMSDateType.All) if (cQMSDateType == CQMSDateType.SpecialEquipmentAndDesignDetails || cQMSDateType == CQMSDateType.All)
{ {
@ -1035,7 +1035,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static int GetConstructSolutionNum(string projectid) public static int GetConstructSolutionNum(string projectid)
{ {
var result = (from x in Funs.DB.Solution_CQMSConstructSolution var result = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
where x.ProjectId == projectid where x.ProjectId == projectid
select x).Count(); select x).Count();
return result; return result;
@ -1047,11 +1047,49 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static int GetConstructSolutionProjectApproveNum(string projectid) public static int GetConstructSolutionProjectApproveNum(string projectid)
{ {
var result = (from x in Funs.DB.Solution_CQMSConstructSolution var result = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
where x.ProjectId == projectid && x.State == "1" where x.ProjectId == projectid && x.ApprovalDate.HasValue
select x).Count(); select x).Count();
return result; return result;
} }
///// <summary>
///// 施工方案数量
///// </summary>
///// <param name="projectid"></param>
///// <returns></returns>
//public static int GetConstructSolutionNum(string projectid)
//{
// var result = (from x in Funs.DB.Solution_CQMSConstructSolution
// where x.ProjectId == projectid
// select x).Count();
// return result;
//}
///// <summary>
///// 施工方案数量——项目审批数量
///// </summary>
///// <param name="projectid"></param>
///// <returns></returns>
//public static int GetConstructSolutionProjectApproveNum(string projectid)
//{
// var result = (from x in Funs.DB.Solution_CQMSConstructSolution
// where x.ProjectId == projectid && x.State == "1"
// select x).Count();
// return result;
//}
/// <summary>
/// 危大（超危大）工程施工方案数量
/// </summary>
/// <param name="projectid"></param>
/// <returns></returns>
public static int GetComprehensive_MajorPlanApprovalNum(string projectid)
{
var result = (from x in Funs.DB.Comprehensive_MajorPlanApproval
where x.ProjectId == projectid
select x).Count();
return result;
}
/// <summary> /// <summary>
/// 施工方案数量——企业审批数量 /// 施工方案数量——企业审批数量
/// </summary> /// </summary>
@ -1070,7 +1108,9 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static int GetSpecialEquipmentQualityAssuranceSystemNum(string projectid) public static int GetSpecialEquipmentQualityAssuranceSystemNum(string projectid)
{ {
var result = 0; var result = (from x in Funs.DB.Comprehensive_QualityAssurance
where x.ProjectId == projectid
select x).Count();
return result; return result;
} }