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

1

Browse Source
This commit is contained in:
夏菊
2025-10-24 18:27:46 +08:00
parent 47172cd0b3
commit 78a2b0f525
47 changed files with 678 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs
+2 -2
View File
@@ -164,7 +164,7 @@ namespace BLL
{
return (from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where x.InspectionId == InspectionId && (y.IsOnceQualified == null || y.IsOnceQualified == true)
where x.InspectionId == InspectionId && y.IsOnceQualified == true
select x).ToList();
}
}
@@ -174,7 +174,7 @@ namespace BLL
{
return (from x in db.ProcessControl_InspectionManagementDetail
join y in db.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
where x.InspectionId == InspectionId && (y.IsOnceQualified == null || y.IsOnceQualified == true)
where x.InspectionId == InspectionId && y.IsOnceQualified == true
select x).ToList();
}
}
SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
+86 -30
View File
@@ -72,7 +72,7 @@ namespace BLL
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(),//控制等级
x.AcceptanceSite,
IsOnceQualified = ((x.IsOnceQualified == null || x.IsOnceQualified == true) ? "是" : "否"),
IsOnceQualified = (x.IsOnceQualified == true ? "是" : "否"),
x.InspectionDate,
x.AttachUrl,
x.AttachUrl2,
@@ -121,7 +121,7 @@ namespace BLL
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(),//控制等级
x.AcceptanceSite,
IsOnceQualified = ((x.IsOnceQualified == null || x.IsOnceQualified == true) ? "是" : "否"),
IsOnceQualified = (x.IsOnceQualified == true ? "是" : "否"),
x.InspectionDate,
x.AttachUrl,
x.AttachUrl2,
@@ -322,16 +322,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@@ -349,16 +357,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@@ -371,16 +387,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@@ -419,16 +443,24 @@ namespace BLL
List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList();
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@@ -446,16 +478,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@@ -469,16 +509,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}
@@ -498,16 +546,24 @@ namespace BLL
}
if (isOnceQualified == true)
{
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == null || x.IsOnceQualified == true).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.IsOnceQualified == true).ToList();
}
if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
if (startDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate >= startDate).ToList();
}
if (SoptDate != null)
{
InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
}
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate >= startDate).ToList();
//}
//if (SoptDate != null)
//{
// InspectionMangementList = InspectionMangementList.Where(x => x.InspectionDate == null || x.InspectionDate <= SoptDate).ToList();
//}
return InspectionMangementList;
}