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
@@ -188,7 +188,7 @@ 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 == true);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && (x.IsOnceQualified == null|| x.IsOnceQualified == true));
if (datetime1.HasValue)
{
getT = getT.Where(x => x.InspectionDate >= datetime1);
@@ -220,7 +220,7 @@ namespace FineUIPro.Web.DataShow
{
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 cout0 = getT.Count();
if (coutall > 0)
@@ -53,7 +53,7 @@ namespace FineUIPro.Web.DataShow
BP.Class,
P.AcceptanceSite,
P.AcceptanceCheckMan,
(CASE WHEN IsOnceQualified='True' THEN '' ELSE '' END)AS IsOnceQualified,
(CASE WHEN IsOnceQualified='Flase' THEN '' ELSE '' END)AS IsOnceQualified,
P.InspectionCode,
P.InspectionDate"
+ @" FROM ProcessControl_InspectionManagementDetail AS D"
@@ -162,7 +162,7 @@ namespace FineUIPro.Web.DataShow
int cout1 = 0;
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();
}
return cout1;
@@ -179,7 +179,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null)
{
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();
}
return cout1;
@@ -196,7 +196,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null)
{
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)
{
rate = Math.Round(getT2.Count() * 1.0 / getT1.Count() * 100, 2).ToString();