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
@@ -503,9 +503,9 @@ namespace BLL
}
if (cQMSDateType == CQMSDateType.ConstructSolution || cQMSDateType == CQMSDateType.All)
{
table.ConstructSolutionNum = GetConstructSolutionNum(projectid);
table.ConstructSolutionNum = GetConstructSolutionNum(projectid) + GetComprehensive_MajorPlanApprovalNum(projectid);
table.ConstructSolutionProjectApproveNum = GetConstructSolutionProjectApproveNum(projectid);
table.ConstructSolutionUnitApproveNum = GetConstructSolutionUnitApproveNum(projectid);
table.ConstructSolutionUnitApproveNum = GetComprehensive_MajorPlanApprovalNum(projectid);
}
if (cQMSDateType == CQMSDateType.SpecialEquipmentAndDesignDetails || cQMSDateType == CQMSDateType.All)
{
@@ -1035,7 +1035,7 @@ namespace BLL
/// <returns></returns>
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
select x).Count();
return result;
@@ -1047,11 +1047,49 @@ namespace BLL
/// <returns></returns>
public static int GetConstructSolutionProjectApproveNum(string projectid)
{
var result = (from x in Funs.DB.Solution_CQMSConstructSolution
where x.ProjectId == projectid && x.State == "1"
var result = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
where x.ProjectId == projectid && x.ApprovalDate.HasValue
select x).Count();
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>
@@ -1070,7 +1108,9 @@ namespace BLL
/// <returns></returns>
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;
}