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

共检

Browse Source
This commit is contained in:
夏菊
2025-09-30 13:32:35 +08:00
parent 2cba5bad4b
commit cd7f83a45c
29 changed files with 354 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainIII.aspx.cs
+2 -2
View File
@@ -55,7 +55,7 @@ namespace FineUIPro.Web.common
var inspectionManagements = from x in db.ProcessControl_InspectionManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
this.divZLGJ.InnerHtml = inspectionManagements.Count().ToString();
//验收数据
this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
//焊工过期人数统计
var welders = from x in db.Comprehensive_InspectionPerson
join y in db.Base_Post on x.PostId equals y.PostId
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.common
select x;
this.divHG.InnerHtml = welders.Count().ToString();
//竣工资料
this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
//NCR
var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
this.divNCR.InnerHtml = NCRManagements.Count().ToString();
SGGL/FineUIPro.Web/common/mainIV.aspx.cs
+2 -2
View File
@@ -78,7 +78,7 @@ namespace FineUIPro.Web.common
select new { x.InspectionId, y.IsOnceQualified }).Distinct().ToList();
this.divZLGJ.InnerHtml = inspectionManagementDetails.Count().ToString();
//验收数据
this.divYS.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == true).ToString();
this.divYS.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
//焊工过期人数统计
var welders = from x in db.Comprehensive_InspectionPerson
join y in db.Base_Post on x.PostId equals y.PostId
@@ -92,7 +92,7 @@ namespace FineUIPro.Web.common
newWelders = newWelders.Distinct().ToList();
this.divHG.InnerHtml = newWelders.Count().ToString();
//竣工资料
this.divJGZL.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == true).ToString();
this.divJGZL.InnerHtml = inspectionManagementDetails.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
//NCR
var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
List<Model.Comprehensive_NCRManagement> newNCRManagements = new List<Model.Comprehensive_NCRManagement>();
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
+6 -6
View File
@@ -26,7 +26,7 @@ namespace FineUIPro.Web
{
var db = new Model.SGGLDB(Funs.ConnString);
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
@@ -284,7 +284,7 @@ namespace FineUIPro.Web
Model.SGGLDB db = Funs.DB;
var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
@@ -321,7 +321,7 @@ namespace FineUIPro.Web
series.Add(s2);
businessColumn.categories = listCategories;
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);
return JsonConvert.SerializeObject(businessColumn);
}
}
@@ -340,7 +340,7 @@ namespace FineUIPro.Web
var cns = BLL.CNProfessionalService.GetCnProList();
Model.SGGLDB db = Funs.DB;
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
@@ -384,7 +384,7 @@ namespace FineUIPro.Web
var cns = BLL.CNProfessionalService.GetList();
Model.SGGLDB db = Funs.DB;
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
where x.ProjectId == this.CurrUser.LoginProjectId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId
@@ -452,7 +452,7 @@ namespace FineUIPro.Web
foreach (var unitWork in unitWorks)
{
listCategories.Add(unitWork.UnitWorkName);
var okChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId && x.IsOnceQualified == true).ToList();
var okChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId && (x.IsOnceQualified == null || x.IsOnceQualified == true)).ToList();
var totalChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId).ToList();
if (okChecks.Count > 0 && totalChecks.Count > 0)
{
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+2 -2
View File
@@ -44,9 +44,9 @@ namespace FineUIPro.Web.common
var inspectionManagements = from x in db.ProcessControl_InspectionManagement where x.ProjectId == this.CurrUser.LoginProjectId select x;
this.divZLGJ.InnerHtml = inspectionManagements.Count().ToString();
//验收数据
this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
this.divYS.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified== null || x.IsOnceQualified == true).ToString();
//竣工资料
this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == true).ToString();
this.divJGZL.InnerHtml = inspectionManagements.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToString();
//NCR
var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId select x;
this.divNCR.InnerHtml = NCRManagements.Count().ToString();