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
@@ -166,6 +166,8 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var datetime3 = Funs.GetNewDateTime(this.txtCompileDateS.Text);
var datetime4 = Funs.GetNewDateTime(this.txtCompileDateE.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
@@ -173,7 +175,15 @@ namespace FineUIPro.Web.DataShow
}
if (datetime2.HasValue)
{
getT = getT.Where(x => x.InspectionDate <= datetime2);
getT = getT.Where(x => x.InspectionDate <= datetime2);
}
if (datetime3.HasValue)
{
getT = getT.Where(x => x.CompileDate >= datetime3);
}
if (datetime4.HasValue)
{
getT = getT.Where(x => x.CompileDate <= datetime4);
}
cout1 = getT.Count();
@@ -188,14 +198,24 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null|| x.IsOnceQualified == true));
var datetime3 = Funs.GetNewDateTime(this.txtCompileDateS.Text);
var datetime4 = Funs.GetNewDateTime(this.txtCompileDateE.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
if (datetime1.HasValue)
{
getT = getT.Where(x => x.InspectionDate >= datetime1);
}
if (datetime2.HasValue)
{
getT = getT.Where(x => x.InspectionDate <= datetime2);
getT = getT.Where(x => x.InspectionDate <= datetime2);
}
if (datetime3.HasValue)
{
getT = getT.Where(x => x.CompileDate >= datetime3);
}
if (datetime4.HasValue)
{
getT = getT.Where(x => x.CompileDate <= datetime4);
}
cout1 = getT.Count();
@@ -210,17 +230,27 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var datetime3 = Funs.GetNewDateTime(this.txtCompileDateS.Text);
var datetime4 = Funs.GetNewDateTime(this.txtCompileDateE.Text);
var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
getALL = getALL.Where(x => x.InspectionDate >= datetime1);
}
if (datetime2.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
getALL = getALL.Where(x => x.InspectionDate >= datetime1);
}
var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null || x.IsOnceQualified == true));
if (datetime3.HasValue)
{
getALL = getALL.Where(x => x.CompileDate >= datetime3);
}
if (datetime4.HasValue)
{
getALL = getALL.Where(x => x.CompileDate <= datetime4);
}
var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
int coutall = getALL.Count();
int cout0 = getT.Count();
if (coutall > 0)