zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并穿透

Browse Source
This commit is contained in:
李超
2023-06-07 10:21:16 +08:00
parent 5e48a4ad91
commit 857a427be6
26 changed files with 231 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
+5 -5
View File
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
@@ -166,7 +166,7 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString() );
var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
getT = getT.Where(x => x.CheckDate >= datetime1);
@@ -175,7 +175,7 @@ namespace FineUIPro.Web.DataShow
{
getT = getT.Where(x => x.CheckDate <= datetime2);
}
cout1 = getT.Count();
}
return cout1;
@@ -197,7 +197,7 @@ namespace FineUIPro.Web.DataShow
{
getT = getT.Where(x => x.CheckDate <= datetime2);
}
cout1 = getT.Count();
}
return cout1;
@@ -232,7 +232,7 @@ namespace FineUIPro.Web.DataShow
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getALL = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);