This commit is contained in:
parent
d5dea8251a
commit
05be3df50f
|
|
@ -315,7 +315,6 @@ namespace BLL
|
||||||
}
|
}
|
||||||
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementListByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementListByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
||||||
{
|
{
|
||||||
SoptDate = SoptDate.AddDays(1);
|
|
||||||
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 (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0")
|
if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0")
|
||||||
{
|
{
|
||||||
|
|
@ -331,6 +330,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
|
SoptDate = SoptDate.AddDays(1);
|
||||||
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
|
|
@ -347,7 +347,6 @@ namespace BLL
|
||||||
}
|
}
|
||||||
public static List<Model.View_CQMS_InspectionManagementDetail> getInspectionManagementDetailListByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
public static List<Model.View_CQMS_InspectionManagementDetail> getInspectionManagementDetailListByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
||||||
{
|
{
|
||||||
SoptDate = SoptDate.AddDays(1);
|
|
||||||
List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail select x).ToList();
|
List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail select x).ToList();
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(projectId))
|
if (!string.IsNullOrEmpty(projectId))
|
||||||
|
|
@ -368,6 +367,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
|
SoptDate = SoptDate.AddDays(1);
|
||||||
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
|
|
@ -384,7 +384,6 @@ namespace BLL
|
||||||
}
|
}
|
||||||
public static List<Model.View_CQMS_InspectionManagementDetail> getInspectionManagementDetailListByUnitIdAndDate(string projectId, string unitId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
public static List<Model.View_CQMS_InspectionManagementDetail> getInspectionManagementDetailListByUnitIdAndDate(string projectId, string unitId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
||||||
{
|
{
|
||||||
SoptDate = SoptDate.AddDays(1);
|
|
||||||
List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.ProjectId == projectId select x).ToList();
|
List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.ProjectId == projectId select x).ToList();
|
||||||
if (!string.IsNullOrEmpty(unitId) && unitId != "0")
|
if (!string.IsNullOrEmpty(unitId) && unitId != "0")
|
||||||
{
|
{
|
||||||
|
|
@ -400,6 +399,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
|
SoptDate = SoptDate.AddDays(1);
|
||||||
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
|
|
@ -446,7 +446,6 @@ namespace BLL
|
||||||
|
|
||||||
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementDetailListByDate(string projectId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementDetailListByDate(string projectId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
||||||
{
|
{
|
||||||
SoptDate = SoptDate.AddDays(1);
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
|
|
@ -458,6 +457,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
|
SoptDate = SoptDate.AddDays(1);
|
||||||
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
|
|
@ -474,7 +474,6 @@ namespace BLL
|
||||||
|
|
||||||
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
||||||
{
|
{
|
||||||
SoptDate = SoptDate.AddDays(1);
|
|
||||||
List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement select x).ToList();
|
List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement select x).ToList();
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(projectId))
|
if (!string.IsNullOrEmpty(projectId))
|
||||||
|
|
@ -495,6 +494,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
|
SoptDate = SoptDate.AddDays(1);
|
||||||
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
|
|
@ -512,7 +512,6 @@ namespace BLL
|
||||||
|
|
||||||
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementByUnitIdAndDate(string projectId, string unitId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementByUnitIdAndDate(string projectId, string unitId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
||||||
{
|
{
|
||||||
SoptDate = SoptDate.AddDays(1);
|
|
||||||
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 (!string.IsNullOrEmpty(unitId) && unitId != "0")
|
if (!string.IsNullOrEmpty(unitId) && unitId != "0")
|
||||||
{
|
{
|
||||||
|
|
@ -528,6 +527,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
|
SoptDate = SoptDate.AddDays(1);
|
||||||
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
|
|
@ -546,7 +546,6 @@ namespace BLL
|
||||||
|
|
||||||
public static List<Model.View_MonthReport_InspectionManagement> getViewMonthReportInspectionManagementByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
public static List<Model.View_MonthReport_InspectionManagement> getViewMonthReportInspectionManagementByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
|
||||||
{
|
{
|
||||||
SoptDate = SoptDate.AddDays(1);
|
|
||||||
List<Model.View_MonthReport_InspectionManagement> InspectionMangementList = (from x in Funs.DB.View_MonthReport_InspectionManagement select x).ToList();
|
List<Model.View_MonthReport_InspectionManagement> InspectionMangementList = (from x in Funs.DB.View_MonthReport_InspectionManagement select x).ToList();
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(projectId))
|
if (!string.IsNullOrEmpty(projectId))
|
||||||
|
|
@ -567,6 +566,7 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
|
SoptDate = SoptDate.AddDays(1);
|
||||||
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue