质量管理控制点检查统计数据问题检查、处理
This commit is contained in:
parent
0d747d4bc4
commit
d5dea8251a
|
|
@ -315,6 +315,7 @@ 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")
|
||||||
{
|
{
|
||||||
|
|
@ -330,7 +331,8 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
||||||
//{
|
//{
|
||||||
|
|
@ -345,6 +347,7 @@ 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))
|
||||||
|
|
@ -365,7 +368,8 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
||||||
//{
|
//{
|
||||||
|
|
@ -380,6 +384,7 @@ 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")
|
||||||
{
|
{
|
||||||
|
|
@ -395,7 +400,8 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
||||||
//{
|
//{
|
||||||
|
|
@ -440,6 +446,7 @@ 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)
|
||||||
{
|
{
|
||||||
|
|
@ -451,7 +458,8 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
||||||
//{
|
//{
|
||||||
|
|
@ -466,6 +474,7 @@ 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))
|
||||||
|
|
@ -486,7 +495,8 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
||||||
//{
|
//{
|
||||||
|
|
@ -502,6 +512,7 @@ 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")
|
||||||
{
|
{
|
||||||
|
|
@ -517,7 +528,8 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
||||||
//{
|
//{
|
||||||
|
|
@ -534,6 +546,7 @@ 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))
|
||||||
|
|
@ -554,7 +567,8 @@ namespace BLL
|
||||||
}
|
}
|
||||||
if (SoptDate != null)
|
if (SoptDate != null)
|
||||||
{
|
{
|
||||||
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
//InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate <= SoptDate).ToList();
|
||||||
|
InspectionMangementList = InspectionMangementList.Where(x => x.CompileDate < SoptDate).ToList();
|
||||||
}
|
}
|
||||||
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
//if (startDate != null && startDate != Convert.ToDateTime("2015-01-01"))
|
||||||
//{
|
//{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue