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

共检

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs
View File

@ -32,7 +32,7 @@ namespace BLL.API.CQMS
newInspectionManagement.Branch = inspectionManagement.Branch; newInspectionManagement.Branch = inspectionManagement.Branch;
newInspectionManagement.ControlPointType = inspectionManagement.ControlPointType; newInspectionManagement.ControlPointType = inspectionManagement.ControlPointType;
newInspectionManagement.AcceptanceSite = inspectionManagement.AcceptanceSite; newInspectionManagement.AcceptanceSite = inspectionManagement.AcceptanceSite;
newInspectionManagement.IsOnceQualified = inspectionManagement.IsOnceQualified == "true" ? true : false; newInspectionManagement.IsOnceQualified = (inspectionManagement.IsOnceQualified == "true"|| inspectionManagement.IsOnceQualified == null) ? true : false;
if (!string.IsNullOrEmpty(inspectionManagement.InspectionDate)) if (!string.IsNullOrEmpty(inspectionManagement.InspectionDate))
newInspectionManagement.InspectionDate = DateTime.Parse(inspectionManagement.InspectionDate); newInspectionManagement.InspectionDate = DateTime.Parse(inspectionManagement.InspectionDate);
newInspectionManagement.AttachUrl = inspectionManagement.AttachUrl; newInspectionManagement.AttachUrl = inspectionManagement.AttachUrl;

4
SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs
View File

@ -164,7 +164,7 @@ namespace BLL
{ {
return (from x in db.ProcessControl_InspectionManagementDetail return (from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where x.InspectionId == InspectionId && y.IsOnceQualified == true where x.InspectionId == InspectionId && (y.IsOnceQualified == null || y.IsOnceQualified == true)
select x).ToList(); select x).ToList();
} }
} }
@ -174,7 +174,7 @@ namespace BLL
{ {
return (from x in db.ProcessControl_InspectionManagementDetail return (from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where x.InspectionId == InspectionId && y.IsOnceQualified == true where x.InspectionId == InspectionId && (y.IsOnceQualified == null || y.IsOnceQualified == true)
select x).ToList(); select x).ToList();
} }
} }

29
SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
View File

@ -72,7 +72,7 @@ namespace BLL
ControlPointType = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.BreakdownName).FirstOrDefault(),//质量控制点 ControlPointType = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.BreakdownName).FirstOrDefault(),//质量控制点
Class = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.Class).FirstOrDefault(),//控制等级 Class = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.Class).FirstOrDefault(),//控制等级
x.AcceptanceSite, x.AcceptanceSite,
IsOnceQualified = (x.IsOnceQualified == true ? "是" : "否"), IsOnceQualified = ((x.IsOnceQualified == null || x.IsOnceQualified == true) ? "是" : "否"),
x.InspectionDate, x.InspectionDate,
x.AttachUrl, x.AttachUrl,
x.AttachUrl2, x.AttachUrl2,
@ -87,7 +87,7 @@ namespace BLL
if (!string.IsNullOrEmpty(controlPointType)) if (!string.IsNullOrEmpty(controlPointType))
{ {
string[] types = controlPointType.Split(','); string[] types = controlPointType.Split(',');
q = q.Where(e=> types.Contains(e.ControlPointType)); q = q.Where(e => types.Contains(e.ControlPointType));
} }
if (UnitWorkId != "0") if (UnitWorkId != "0")
{ {
@ -121,7 +121,7 @@ namespace BLL
ControlPointType = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.BreakdownName).FirstOrDefault(),//质量控制点 ControlPointType = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.BreakdownName).FirstOrDefault(),//质量控制点
Class = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.Class).FirstOrDefault(),//控制等级 Class = (from y in db.WBS_BreakdownProject where y.BreakdownProjectId == x.ControlPointType select y.Class).FirstOrDefault(),//控制等级
x.AcceptanceSite, x.AcceptanceSite,
IsOnceQualified = (x.IsOnceQualified == true ? "是" : "否"), IsOnceQualified = ((x.IsOnceQualified == null || x.IsOnceQualified == true) ? "是" : "否"),
x.InspectionDate, x.InspectionDate,
x.AttachUrl, x.AttachUrl,
x.AttachUrl2, x.AttachUrl2,
@ -196,13 +196,13 @@ namespace BLL
dataTable.Columns.Add(row.ToString()); dataTable.Columns.Add(row.ToString());
} }
data.Tables.Add(dataTable); data.Tables.Add(dataTable);
for (int i = startRowIndex; i <= (startRowIndex + maximumRows)&&i<dataSet.Tables[0].Rows.Count; i++) for (int i = startRowIndex; i <= (startRowIndex + maximumRows) && i < dataSet.Tables[0].Rows.Count; i++)
{ {
var row = dataTable.NewRow(); var row = dataTable.NewRow();
row["AcceptanceCheckMan"] = dataSet.Tables[0].Rows[i]["AcceptanceCheckMan"]; row["AcceptanceCheckMan"] = dataSet.Tables[0].Rows[i]["AcceptanceCheckMan"];
row["SunNumber"] = dataSet.Tables[0].Rows[i]["SunNumber"]; row["SunNumber"] = dataSet.Tables[0].Rows[i]["SunNumber"];
row["OneStatisticsSunNumber"] = dataSet.Tables[0].Rows[i]["OneStatisticsSunNumber"]; row["OneStatisticsSunNumber"] = dataSet.Tables[0].Rows[i]["OneStatisticsSunNumber"];
row["OneStatistics"] = dataSet.Tables[0].Rows[i]["OneStatistics"].ToString() +"%"; row["OneStatistics"] = dataSet.Tables[0].Rows[i]["OneStatistics"].ToString() + "%";
dataTable.Rows.Add(row); dataTable.Rows.Add(row);
} }
return data; return data;
@ -322,7 +322,7 @@ namespace BLL
} }
if (isOnceQualified == true) if (isOnceQualified == true)
{ {
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
} }
if (startDate != null && SoptDate != null) if (startDate != null && SoptDate != null)
{ {
@ -341,11 +341,11 @@ namespace BLL
} }
if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0") if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0")
{ {
InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId==cNProfessionalId select x).ToList(); InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList();
} }
if (isOnceQualified == true) if (isOnceQualified == true)
{ {
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
} }
if (startDate != null && SoptDate != null) if (startDate != null && SoptDate != null)
{ {
@ -363,7 +363,7 @@ namespace BLL
} }
if (isOnceQualified == true) if (isOnceQualified == true)
{ {
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
} }
if (startDate != null && SoptDate != null) if (startDate != null && SoptDate != null)
{ {
@ -386,7 +386,8 @@ namespace BLL
/// <summary> /// <summary>
/// 根据id修改验收日期和是否一次合格 /// 根据id修改验收日期和是否一次合格
/// </summary> /// </summary>
public static void UpdateByInspectionManagementId(Model.ProcessControl_InspectionManagement inspectionManagement) { public static void UpdateByInspectionManagementId(Model.ProcessControl_InspectionManagement inspectionManagement)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
Model.ProcessControl_InspectionManagement newInspectionManagement = db.ProcessControl_InspectionManagement.FirstOrDefault(e => e.InspectionId == inspectionManagement.InspectionId); Model.ProcessControl_InspectionManagement newInspectionManagement = db.ProcessControl_InspectionManagement.FirstOrDefault(e => e.InspectionId == inspectionManagement.InspectionId);
@ -406,7 +407,7 @@ namespace BLL
List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList(); List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList();
if (isOnceQualified == true) if (isOnceQualified == true)
{ {
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
} }
if (startDate != null && SoptDate != null) if (startDate != null && SoptDate != null)
{ {
@ -429,7 +430,7 @@ namespace BLL
} }
if (isOnceQualified == true) if (isOnceQualified == true)
{ {
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
} }
if (startDate != null && SoptDate != null) if (startDate != null && SoptDate != null)
{ {
@ -448,7 +449,7 @@ namespace BLL
} }
if (isOnceQualified == true) if (isOnceQualified == true)
{ {
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
} }
if (startDate != null && SoptDate != null) if (startDate != null && SoptDate != null)
{ {
@ -473,7 +474,7 @@ namespace BLL
} }
if (isOnceQualified == true) if (isOnceQualified == true)
{ {
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == null || x.IsOnceQualified == true select x).ToList();
} }
if (startDate != null && SoptDate != null) if (startDate != null && SoptDate != null)
{ {

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

@ -1527,7 +1527,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "1" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "1" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput() select new Model.InspectionManagementOutput()
{ {
ProjectId = y.ProjectId, ProjectId = y.ProjectId,
@ -1589,7 +1589,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "2" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "2" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput() select new Model.InspectionManagementOutput()
{ {
ProjectId = y.ProjectId, ProjectId = y.ProjectId,
@ -1650,7 +1650,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "3" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "3" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput() select new Model.InspectionManagementOutput()
{ {
ProjectId = y.ProjectId, ProjectId = y.ProjectId,
@ -1713,7 +1713,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "4" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "4" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput() select new Model.InspectionManagementOutput()
{ {
ProjectId = y.ProjectId, ProjectId = y.ProjectId,
@ -1776,7 +1776,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput() select new Model.InspectionManagementOutput()
{ {
ProjectId = y.ProjectId, ProjectId = y.ProjectId,
@ -1839,7 +1839,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "5" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput() select new Model.InspectionManagementOutput()
{ {
ProjectId = y.ProjectId, ProjectId = y.ProjectId,
@ -1901,7 +1901,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "6" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where BeUnderConstructionList.Contains(y.ProjectId) && y.CheckAcceptType == "6" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select new Model.InspectionManagementOutput() select new Model.InspectionManagementOutput()
{ {
ProjectId = y.ProjectId, ProjectId = y.ProjectId,

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

@ -743,7 +743,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "1" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where y.ProjectId == projectid && y.CheckAcceptType == "1" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select x).Count(); select x).Count();
return result; return result;
} }
@ -768,7 +768,7 @@ namespace BLL
var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail var result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "2" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where y.ProjectId == projectid && y.CheckAcceptType == "2" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select x).Count(); select x).Count();
return result; return result;
} }
@ -793,7 +793,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "3" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where y.ProjectId == projectid && y.CheckAcceptType == "3" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select x).Count(); select x).Count();
return result; return result;
} }
@ -818,7 +818,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "4" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where y.ProjectId == projectid && y.CheckAcceptType == "4" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select x).Count(); select x).Count();
return result; return result;
} }
@ -843,7 +843,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "5" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where y.ProjectId == projectid && y.CheckAcceptType == "5" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select x).Count(); select x).Count();
return result; return result;
} }
@ -868,7 +868,7 @@ namespace BLL
int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail int result = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId join y in Funs.DB.WBS_BreakdownProject on x.ControlPointType equals y.BreakdownProjectId
join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId join z in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals z.InspectionId
where y.ProjectId == projectid && y.CheckAcceptType == "6" && z.IsOnceQualified == true && x.CreateDate > Const.DtmarkTime where y.ProjectId == projectid && y.CheckAcceptType == "6" && (z.IsOnceQualified == null || z.IsOnceQualified == true) && x.CreateDate > Const.DtmarkTime
select x).Count(); select x).Count();
return result; return result;
} }

2
SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs
View File

@ -3179,7 +3179,7 @@ namespace FineUIPro.Web.CQMS.DataBase
Ins.UnitWorkId, Ins.UnitWorkId,
Ins.ControlPointType, Ins.ControlPointType,
Ins.AcceptanceSite, Ins.AcceptanceSite,
(CASE WHEN Ins.IsOnceQualified=1 THEN '是' ELSE '否' END) AS IsOnceQualified, (CASE WHEN Ins.IsOnceQualified=0 THEN '否' ELSE '是' END) AS IsOnceQualified,
Ins.InspectionDate, Ins.InspectionDate,
Ins.AttachUrl, Ins.AttachUrl,
Ins.CheckDate, Ins.CheckDate,

2
SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointCheck.aspx.cs
View File

@ -48,7 +48,7 @@ namespace FineUIPro.Web.CQMS.Foreign
checks.Branch, checks.Branch,
breakdown.BreakdownName as ControlPointType, breakdown.BreakdownName as ControlPointType,
checks.AcceptanceSite, checks.AcceptanceSite,
(CASE WHEN checks.IsOnceQualified='True' THEN '是' ELSE '否' END) AS IsOnceQualified, (CASE WHEN checks.IsOnceQualified='Flase' THEN '否' ELSE '是' END) AS IsOnceQualified,
checks.InspectionDate, checks.InspectionDate,
checks.AttachUrl, checks.AttachUrl,
checks.CheckDate, checks.CheckDate,

18
SGGL/FineUIPro.Web/CQMS/ManageReport/CheckStatisc.aspx.cs
View File

@ -101,8 +101,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName); workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null|| x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
} }
else //更新已有记录 else //更新已有记录
@ -110,8 +110,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }
@ -151,8 +151,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
checkStatisc.WorkName = item.ProfessionalName; checkStatisc.WorkName = item.ProfessionalName;
checkStatisc.CheckNum = managementList.Count(); checkStatisc.CheckNum = managementList.Count();
checkStatisc.TotalCheckNum = totalManagementList.Count(); checkStatisc.TotalCheckNum = totalManagementList.Count();
checkStatisc.OKNum = managementList.Count(x => x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.IsOnceQualified == null|| x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
i++; i++;
} }
@ -251,7 +251,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
} }
else //更新已有记录 else //更新已有记录
@ -259,8 +259,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }

4
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs
View File

@ -535,8 +535,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
checkStatisc.WorkName = ins.UnitWorkName; checkStatisc.WorkName = ins.UnitWorkName;
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item); checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
} }

32
SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportPrint.aspx.cs
View File

@ -250,8 +250,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(ins.UnitWorkName); workNames.Add(ins.UnitWorkName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
i++; i++;
} }
@ -260,8 +260,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }
@ -286,8 +286,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName); workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
i++; i++;
} }
@ -296,8 +296,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }
@ -1519,8 +1519,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(ins.UnitWorkName); workNames.Add(ins.UnitWorkName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
i++; i++;
} }
@ -1529,8 +1529,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }
@ -1555,8 +1555,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName); workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
i++; i++;
} }
@ -1565,8 +1565,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }

4
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
View File

@ -530,8 +530,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
checkStatisc.WorkName = ins.UnitWorkName; checkStatisc.WorkName = ins.UnitWorkName;
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item); checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
} }

32
SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportPrint.aspx.cs
View File

@ -252,8 +252,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(ins.UnitWorkName); workNames.Add(ins.UnitWorkName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
i++; i++;
} }
@ -262,8 +262,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }
@ -288,8 +288,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName); workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
i++; i++;
} }
@ -298,8 +298,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }
@ -1523,8 +1523,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(ins.UnitWorkName); workNames.Add(ins.UnitWorkName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
i++; i++;
} }
@ -1533,8 +1533,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }
@ -1559,8 +1559,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
workNames.Add(divisionProject.DivisionName); workNames.Add(divisionProject.DivisionName);
checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
i++; i++;
} }
@ -1569,8 +1569,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName); Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == divisionProject.DivisionName);
checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType); checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true); checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && (x.IsOnceQualified == null || x.IsOnceQualified == true));
} }
} }
} }

28
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
View File

@ -357,7 +357,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
var units21 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); var units21 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
var units2 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 ).ToList(); var units2 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
var remarks = loadRemarksDt(); var remarks = loadRemarksDt();
var cqmsRemarks = cqmsRemarksDt(); var cqmsRemarks = cqmsRemarksDt();
@ -380,7 +380,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
var qualityInspection = LoadQualityInspectionDt(); var qualityInspection = LoadQualityInspectionDt();
var specialCheck = loadSpecialCheckDt(); var specialCheck = loadSpecialCheckDt();
var fileReport = loadFileReportDt(); var fileReport = loadFileReportDt();
await Task.WhenAll(new[] { remarks, cqmsRemarks, generalPlanApproval, majorPlanApproval, inspectionTestPlan, designDetailsApprove, reviewDrawings, designChangeOrder, passWelder, processControl_NondestructiveTest, inspectionEquipment, measuringInspection, checkLotBindStatisc, InspectionDataInspection, pressureInspection, pipingInspection, specialInspection, ncrManagementInspection , qualityInspection, specialCheck, fileReport }); await Task.WhenAll(new[] { remarks, cqmsRemarks, generalPlanApproval, majorPlanApproval, inspectionTestPlan, designDetailsApprove, reviewDrawings, designChangeOrder, passWelder, processControl_NondestructiveTest, inspectionEquipment, measuringInspection, checkLotBindStatisc, InspectionDataInspection, pressureInspection, pipingInspection, specialInspection, ncrManagementInspection, qualityInspection, specialCheck, fileReport });
var generalPlanApprovalData = await generalPlanApproval; var generalPlanApprovalData = await generalPlanApproval;
var remarksData = await remarks; var remarksData = await remarks;
@ -790,7 +790,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
string CNProfessionalId = row["CNProfessionalId"].ToString(); string CNProfessionalId = row["CNProfessionalId"].ToString();
string ImplementationFrontState = row["ImplementationFrontState"].ToString(); string ImplementationFrontState = row["ImplementationFrontState"].ToString();
DateTime? IssuedDate = Funs.GetNewDateTime(row["IssuedDate"].ToString()); DateTime? IssuedDate = Funs.GetNewDateTime(row["IssuedDate"].ToString());
string ApprovalDate = row["ApprovalDate"].ToString() ; string ApprovalDate = row["ApprovalDate"].ToString();
if (!Quantity1Dic.ContainsKey(CNProfessionalId)) if (!Quantity1Dic.ContainsKey(CNProfessionalId))
{ {
@ -837,7 +837,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{ {
Quantity3Dic[CNProfessionalId] = Quantity3Dic[CNProfessionalId] + 1; Quantity3Dic[CNProfessionalId] = Quantity3Dic[CNProfessionalId] + 1;
} }
if(ImplementationFrontState== "已完成") if (ImplementationFrontState == "已完成")
{ {
Quantity5Dic[CNProfessionalId] = Quantity5Dic[CNProfessionalId] + 1; Quantity5Dic[CNProfessionalId] = Quantity5Dic[CNProfessionalId] + 1;
} }
@ -860,7 +860,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.WorkName = item.ProfessionalName; checkStatisc.WorkName = item.ProfessionalName;
checkStatisc.OneOKRate = "0"; checkStatisc.OneOKRate = "0";
checkStatisc.TotalOneOKRate ="0"; checkStatisc.TotalOneOKRate = "0";
if (Quantity1Dic.ContainsKey(item.CNProfessionalId)) if (Quantity1Dic.ContainsKey(item.CNProfessionalId))
{ {
checkStatisc.CheckNum = Quantity1Dic[item.CNProfessionalId]; checkStatisc.CheckNum = Quantity1Dic[item.CNProfessionalId];
@ -2058,7 +2058,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{ {
string UnitId = row["UnitId"].ToString(); string UnitId = row["UnitId"].ToString();
int ActualNumber = Funs.GetNewIntOrZero(row["ActualNumber"].ToString()); int ActualNumber = Funs.GetNewIntOrZero(row["ActualNumber"].ToString());
int PressurePipeNumber = Funs.GetNewIntOrZero( row["PressurePipeNumber"].ToString()); int PressurePipeNumber = Funs.GetNewIntOrZero(row["PressurePipeNumber"].ToString());
DateTime? ReportTime = Funs.GetNewDateTime(row["ReportTime"].ToString()); DateTime? ReportTime = Funs.GetNewDateTime(row["ReportTime"].ToString());
if (!Quantity1Dic.ContainsKey(UnitId)) if (!Quantity1Dic.ContainsKey(UnitId))
{ {
@ -2444,7 +2444,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
model.ProjectCount = Quantity2Dic[item.UnitId]; model.ProjectCount = Quantity2Dic[item.UnitId];
if (model.ProjectCount.Value > 0) if (model.ProjectCount.Value > 0)
{ {
model.RectificationRate = (100.0 * (ClosedCount/ model.ProjectCount.Value)).ToString("#0.00") + "%"; model.RectificationRate = (100.0 * (ClosedCount / model.ProjectCount.Value)).ToString("#0.00") + "%";
} }
else else
{ {
@ -2648,7 +2648,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString(); model.Id = Guid.NewGuid().ToString();
model.ContentName = item.UnitName; model.ContentName = item.UnitName;
model.MonthsCount =0; model.MonthsCount = 0;
model.ProjectCount = 0; model.ProjectCount = 0;
model.MonthsBackCount = 0; model.MonthsBackCount = 0;
model.TotalNoBackCount = 0; model.TotalNoBackCount = 0;
@ -2657,7 +2657,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
model.MonthsCount = Quantity2Dic[item.UnitId]; model.MonthsCount = Quantity2Dic[item.UnitId];
model.ProjectCount = Quantity1Dic[item.UnitId]; model.ProjectCount = Quantity1Dic[item.UnitId];
model.MonthsBackCount = Quantity3Dic[item.UnitId]; model.MonthsBackCount = Quantity3Dic[item.UnitId];
model.TotalNoBackCount = Quantity1Dic[item.UnitId]-Quantity4Dic[item.UnitId]; model.TotalNoBackCount = Quantity1Dic[item.UnitId] - Quantity4Dic[item.UnitId];
} }
model.ReportId = ReportId; model.ReportId = ReportId;
@ -3859,7 +3859,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
string strSql = @"select UnitId,ProfessionalName,MonthQuantity,TotalQuantity,MonthRate,TotalRate string strSql = @"select UnitId,ProfessionalName,MonthQuantity,TotalQuantity,MonthRate,TotalRate
from ProcessControl_NondestructiveTest_New from ProcessControl_NondestructiveTest_New
where ProjectId='" + this.CurrUser.LoginProjectId + "' and CreateDate >='"+ startDate + "' and CreateDate <='"+ endDate + "'"; where ProjectId='" + this.CurrUser.LoginProjectId + "' and CreateDate >='" + startDate + "' and CreateDate <='" + endDate + "'";
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null); DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
return dt; return dt;
}); });
@ -4170,8 +4170,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.WorkName = item.UnitName; checkStatisc.WorkName = item.UnitName;
checkStatisc.CheckNum = monethCount.Count(); checkStatisc.CheckNum = monethCount.Count();
checkStatisc.TotalCheckNum = AllList.Count(); checkStatisc.TotalCheckNum = AllList.Count();
checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == true); checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == true); checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
if (checkStatisc.CheckNum != 0)//被除数不能为零 if (checkStatisc.CheckNum != 0)//被除数不能为零
{ {
@ -4302,8 +4302,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item); checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true)e);
if (checkStatisc.CheckNum != 0)//被除数不能为零 if (checkStatisc.CheckNum != 0)//被除数不能为零
{ {

4
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
View File

@ -664,8 +664,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.WorkName = ins.UnitWorkName; checkStatisc.WorkName = ins.UnitWorkName;
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item); checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
} }
} }

4
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
View File

@ -1576,8 +1576,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.WorkName = ins.UnitWorkName; checkStatisc.WorkName = ins.UnitWorkName;
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item); checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
StatisticsList.Add(checkStatisc); StatisticsList.Add(checkStatisc);
} }
} }

8
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
View File

@ -4139,8 +4139,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.WorkName = item.UnitName; checkStatisc.WorkName = item.UnitName;
checkStatisc.CheckNum = monethCount.Count(); checkStatisc.CheckNum = monethCount.Count();
checkStatisc.TotalCheckNum = AllList.Count(); checkStatisc.TotalCheckNum = AllList.Count();
checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == true); checkStatisc.OKNum = monethCount.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == true); checkStatisc.TotalOKNum = AllList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
if (checkStatisc.CheckNum != 0)//被除数不能为零 if (checkStatisc.CheckNum != 0)//被除数不能为零
{ {
@ -4266,8 +4266,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item); checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item);
checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item); checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item);
checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && (x.IsOnceQualified == null || x.IsOnceQualified == true));
if (checkStatisc.CheckNum != 0)//被除数不能为零 if (checkStatisc.CheckNum != 0)//被除数不能为零
{ {

6
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs
View File

@ -259,13 +259,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl
/// <param name="e"></param> /// <param name="e"></param>
protected void rblIsOnceQualified_SelectedIndexChanged(object sender, EventArgs e) protected void rblIsOnceQualified_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (this.rblIsOnceQualified.SelectedValue == "True") if (this.rblIsOnceQualified.SelectedValue == "Flase")
{ {
this.txtUnqualifiedReason.Hidden = true; this.txtUnqualifiedReason.Hidden = false;
} }
else else
{ {
this.txtUnqualifiedReason.Hidden = false; this.txtUnqualifiedReason.Hidden = true;
} }
} }
#endregion #endregion

4
SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs
View File

@ -188,7 +188,7 @@ namespace FineUIPro.Web.DataShow
{ {
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null|| x.IsOnceQualified == true));
if (datetime1.HasValue) if (datetime1.HasValue)
{ {
getT = getT.Where(x => x.InspectionDate >= datetime1); getT = getT.Where(x => x.InspectionDate >= datetime1);
@ -220,7 +220,7 @@ namespace FineUIPro.Web.DataShow
{ {
getALL = getALL.Where(x => x.CheckDate >= datetime1); getALL = getALL.Where(x => x.CheckDate >= datetime1);
} }
var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null || x.IsOnceQualified == true));
int coutall = getALL.Count(); int coutall = getALL.Count();
int cout0 = getT.Count(); int cout0 = getT.Count();
if (coutall > 0) if (coutall > 0)

2
SGGL/FineUIPro.Web/DataShow/InspectionManagementItem.aspx.cs
View File

@ -53,7 +53,7 @@ namespace FineUIPro.Web.DataShow
BP.Class, BP.Class,
P.AcceptanceSite, P.AcceptanceSite,
P.AcceptanceCheckMan, P.AcceptanceCheckMan,
(CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified, (CASE WHEN IsOnceQualified='Flase' THEN '否' ELSE '是' END)AS IsOnceQualified,
P.InspectionCode, P.InspectionCode,
P.InspectionDate" P.InspectionDate"
+ @" FROM ProcessControl_InspectionManagementDetail AS D" + @" FROM ProcessControl_InspectionManagementDetail AS D"

6
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
View File

@ -162,7 +162,7 @@ namespace FineUIPro.Web.DataShow
int cout1 = 0; int cout1 = 0;
if (projectId != null) if (projectId != null)
{ {
var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true); var getT = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && (x.IsOnceQualified == null || x.IsOnceQualified == true));
cout1 = getT.Count(); cout1 = getT.Count();
} }
return cout1; return cout1;
@ -179,7 +179,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null) if (projectId != null)
{ {
var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue); var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue);
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true); var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && (x.IsOnceQualified == null || x.IsOnceQualified == true));
cout1 = getT1.Count() - getT2.Count(); cout1 = getT1.Count() - getT2.Count();
} }
return cout1; return cout1;
@ -196,7 +196,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null) if (projectId != null)
{ {
var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue); var getT1 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue);
var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && x.IsOnceQualified == true); var getT2 = getDataItemLists.Where(x => x.ProjectId == projectId.ToString() && x.CheckAcceptType == this.rbType.SelectedValue && (x.IsOnceQualified == null || x.IsOnceQualified == true));
if (getT1.Count() > 0) if (getT1.Count() > 0)
{ {
rate = Math.Round(getT2.Count() * 1.0 / getT1.Count() * 100, 2).ToString(); rate = Math.Round(getT2.Count() * 1.0 / getT1.Count() * 100, 2).ToString();

2
SGGL/FineUIPro.Web/DataShowLocal/InspectionManagementStatisc.aspx.cs
View File

@ -185,7 +185,7 @@ namespace FineUIPro.Web.DataShowLocal
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.View_CQMS_InspectionManagementDetail var getD1 = from x in Funs.DB.View_CQMS_InspectionManagementDetail
where x.ProjectId == projectId.ToString() && x.IsOnceQualified==true where x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x; select x;
if (datetime1.HasValue) if (datetime1.HasValue)

30
SGGL/FineUIPro.Web/ZHGL/CQMSData/CQMSCheckData.aspx
View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>现场质量检查</title> <title>现场质量检查</title>
<style> <style>
/* 增强合计行样式 - 使用多种选择器确保生效 */ /* 增强合计行样式 - 使用多种选择器确保生效 */
@ -16,15 +16,15 @@
</style> </style>
</head> </head>
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server"/> <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true" <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场质量检查" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场质量检查" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" SortField="SortIndex" runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" SortField="SortIndex"
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowColumnLocking="true" EnableSummary="true" SummaryPosition="Flow" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowColumnLocking="true" EnableSummary="true" SummaryPosition="Bottom"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"> AllowPaging="false" IsDatabasePaging="false" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items> <Items>
@ -93,10 +93,10 @@
</f:GroupField> </f:GroupField>
<f:GroupField HeaderText="质量专项检查" TextAlign="Center"> <f:GroupField HeaderText="质量专项检查" TextAlign="Center">
<Columns> <Columns>
<f:RenderField Width="100px" ColumnID="Value9" DataField="Value9" <f:RenderField Width="110px" ColumnID="Value9" DataField="Value9"
FieldType="String" HeaderText="本月检查次数" TextAlign="Center" HeaderTextAlign="Center"> FieldType="String" HeaderText="本月检查次数" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="Value10" DataField="Value10" <f:RenderField Width="110px" ColumnID="Value10" DataField="Value10"
FieldType="String" HeaderText="累计检查次数" TextAlign="Center" HeaderTextAlign="Center"> FieldType="String" HeaderText="累计检查次数" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
@ -115,7 +115,7 @@
<f:RenderField Width="100px" ColumnID="Value14" DataField="Value14" <f:RenderField Width="100px" ColumnID="Value14" DataField="Value14"
FieldType="String" HeaderText="累计已整改" TextAlign="Center" HeaderTextAlign="Center"> FieldType="String" HeaderText="累计已整改" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="Value15" DataField="Value15" <f:RenderField Width="110px" ColumnID="Value15" DataField="Value15"
FieldType="String" HeaderText="累计完成比例" TextAlign="Center" HeaderTextAlign="Center"> FieldType="String" HeaderText="累计完成比例" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
@ -129,11 +129,11 @@
</f:ToolbarText> </f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged"> OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10"/> <f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15"/> <f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20"/> <f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25"/> <f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000"/> <f:ListItem Text="所有行" Value="100000" />
</f:DropDownList> </f:DropDownList>
</PageItems> </PageItems>
</f:Grid> </f:Grid>
@ -145,8 +145,8 @@
Width="1200px"> Width="1200px">
</f:Window> </f:Window>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
function reloadGrid() { function reloadGrid() {
__doPostBack(null, 'reloadGrid'); __doPostBack(null, 'reloadGrid');

4
SGGL/FineUIPro.Web/ZHGL/CQMSData/CQMSCheckData.aspx.cs
View File

@ -70,8 +70,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value1 = managementList.Count(); value1 = managementList.Count();
value2 = totalManagementList.Count(); value2 = totalManagementList.Count();
value3 = managementList.Count(x => x.IsOnceQualified == true); value3 = managementList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value4 = totalManagementList.Count(x => x.IsOnceQualified == true); value4 = totalManagementList.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
if (value1 != 0)//被除数不能为零 if (value1 != 0)//被除数不能为零

20
SGGL/FineUIPro.Web/ZHGL/CQMSData/CQMSNoticeDetailsData.aspx.cs
View File

@ -92,8 +92,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value1 = managementList1.Count(); value1 = managementList1.Count();
value2 = totalManagementList1.Count(); value2 = totalManagementList1.Count();
value3 = managementList1.Count(x => x.IsOnceQualified == true); value3 = managementList1.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value4 = totalManagementList1.Count(x => x.IsOnceQualified == true); value4 = totalManagementList1.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
if (value1 != 0)//被除数不能为零 if (value1 != 0)//被除数不能为零
{ {
@ -119,8 +119,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value7 = managementList2.Count(); value7 = managementList2.Count();
value8 = totalManagementList2.Count(); value8 = totalManagementList2.Count();
value9 = managementList2.Count(x => x.IsOnceQualified == true); value9 = managementList2.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value10 = totalManagementList2.Count(x => x.IsOnceQualified == true); value10 = totalManagementList2.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
if (value7 != 0)//被除数不能为零 if (value7 != 0)//被除数不能为零
{ {
@ -146,8 +146,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value13 = managementList3.Count(); value13 = managementList3.Count();
value14 = totalManagementList3.Count(); value14 = totalManagementList3.Count();
value15 = managementList3.Count(x => x.IsOnceQualified == true); value15 = managementList3.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value16 = totalManagementList3.Count(x => x.IsOnceQualified == true); value16 = totalManagementList3.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
if (value13 != 0)//被除数不能为零 if (value13 != 0)//被除数不能为零
{ {
@ -173,8 +173,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value19 = managementList4.Count(); value19 = managementList4.Count();
value20 = totalManagementList4.Count(); value20 = totalManagementList4.Count();
value21 = managementList4.Count(x => x.IsOnceQualified == true); value21 = managementList4.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value22 = totalManagementList4.Count(x => x.IsOnceQualified == true); value22 = totalManagementList4.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
if (value19 != 0)//被除数不能为零 if (value19 != 0)//被除数不能为零
{ {
@ -200,8 +200,8 @@ namespace FineUIPro.Web.ZHGL.CQMSData
value25 = managementList5.Count(); value25 = managementList5.Count();
value26 = totalManagementList5.Count(); value26 = totalManagementList5.Count();
value27 = managementList5.Count(x => x.IsOnceQualified == true); value27 = managementList5.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
value28 = totalManagementList5.Count(x => x.IsOnceQualified == true); value28 = totalManagementList5.Count(x => x.IsOnceQualified == null || x.IsOnceQualified == true);
if (value25 != 0)//被除数不能为零 if (value25 != 0)//被除数不能为零
{ {

2
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
View File

@ -276,7 +276,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
//一次共检合格数 //一次共检合格数
var list20 = (from x in Funs.DB.ProcessControl_InspectionManagement var list20 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == true where x.IsOnceQualified == null || x.IsOnceQualified == true
select new { x.ProjectId,x.InspectionDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList(); select new { x.ProjectId,x.InspectionDate,x.IsOnceQualified,x.InspectionId, Isid= x.InspectionId }).ToList();
////总数 ////总数
var list21 = (from x in Funs.DB.ProcessControl_InspectionManagement var list21 = (from x in Funs.DB.ProcessControl_InspectionManagement

4
SGGL/FineUIPro.Web/common/mainIII.aspx.cs
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; 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.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 var welders = from x in db.Comprehensive_InspectionPerson
join y in db.Base_Post on x.PostId equals y.PostId join y in db.Base_Post on x.PostId equals y.PostId
@ -63,7 +63,7 @@ namespace FineUIPro.Web.common
select x; select x;
this.divHG.InnerHtml = welders.Count().ToString(); 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 //NCR
var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x; 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(); this.divNCR.InnerHtml = NCRManagements.Count().ToString();

4
SGGL/FineUIPro.Web/common/mainIV.aspx.cs
View File

@ -78,7 +78,7 @@ namespace FineUIPro.Web.common
select new { x.InspectionId, y.IsOnceQualified }).Distinct().ToList(); select new { x.InspectionId, y.IsOnceQualified }).Distinct().ToList();
this.divZLGJ.InnerHtml = inspectionManagementDetails.Count().ToString(); 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 var welders = from x in db.Comprehensive_InspectionPerson
join y in db.Base_Post on x.PostId equals y.PostId join y in db.Base_Post on x.PostId equals y.PostId
@ -92,7 +92,7 @@ namespace FineUIPro.Web.common
newWelders = newWelders.Distinct().ToList(); newWelders = newWelders.Distinct().ToList();
this.divHG.InnerHtml = newWelders.Count().ToString(); 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 //NCR
var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x; 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>(); List<Model.Comprehensive_NCRManagement> newNCRManagements = new List<Model.Comprehensive_NCRManagement>();

10
SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
View File

@ -26,7 +26,7 @@ namespace FineUIPro.Web
{ {
var db = new Model.SGGLDB(Funs.ConnString); var db = new Model.SGGLDB(Funs.ConnString);
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement 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(); select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
@ -284,7 +284,7 @@ namespace FineUIPro.Web
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2); var units = BLL.ProjectUnitService.GetProjectUnitListByProjectIdUnitType(CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement 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(); select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
@ -340,7 +340,7 @@ namespace FineUIPro.Web
var cns = BLL.CNProfessionalService.GetCnProList(); var cns = BLL.CNProfessionalService.GetCnProList();
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement 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(); select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
@ -384,7 +384,7 @@ namespace FineUIPro.Web
var cns = BLL.CNProfessionalService.GetList(); var cns = BLL.CNProfessionalService.GetList();
Model.SGGLDB db = Funs.DB; Model.SGGLDB db = Funs.DB;
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement 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(); select x).ToList();
List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
where x.ProjectId == this.CurrUser.LoginProjectId where x.ProjectId == this.CurrUser.LoginProjectId
@ -452,7 +452,7 @@ namespace FineUIPro.Web
foreach (var unitWork in unitWorks) foreach (var unitWork in unitWorks)
{ {
listCategories.Add(unitWork.UnitWorkName); 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(); var totalChecks = TotalCheckDetailOKLists.Where(x => x.UnitWorkId == unitWork.UnitWorkId).ToList();
if (okChecks.Count > 0 && totalChecks.Count > 0) if (okChecks.Count > 0 && totalChecks.Count > 0)
{ {

4
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
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; var inspectionManagements = from x in db.ProcessControl_InspectionManagement where x.ProjectId == this.CurrUser.LoginProjectId select x;
this.divZLGJ.InnerHtml = inspectionManagements.Count().ToString(); 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 //NCR
var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId select x; var NCRManagements = from x in db.Comprehensive_NCRManagement where x.ProjectId == this.CurrUser.LoginProjectId select x;
this.divNCR.InnerHtml = NCRManagements.Count().ToString(); this.divNCR.InnerHtml = NCRManagements.Count().ToString();