20230629安全质量问题排查新增合计
This commit is contained in:
parent
304d978873
commit
c87892eacb
|
|
@ -19,7 +19,8 @@
|
||||||
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
|
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
|
||||||
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
|
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
|
||||||
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
|
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
|
||||||
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
|
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"
|
||||||
|
EnableSummary="true" SummaryPosition="Bottom">
|
||||||
<Toolbars>
|
<Toolbars>
|
||||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||||
<Items>
|
<Items>
|
||||||
|
|
@ -31,8 +32,8 @@
|
||||||
</f:DatePicker>
|
</f:DatePicker>
|
||||||
<f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
|
<f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
|
||||||
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
||||||
<f:RadioItem Text="重大" Value="0" Selected="true" />
|
<f:RadioItem Text="重大" Value="0" />
|
||||||
<f:RadioItem Text="一般" Value="1" />
|
<f:RadioItem Text="一般" Value="1" Selected="true" />
|
||||||
</f:RadioButtonList>
|
</f:RadioButtonList>
|
||||||
<f:Label ID="Label3" runat="server" Text="至">
|
<f:Label ID="Label3" runat="server" Text="至">
|
||||||
</f:Label>
|
</f:Label>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using BLL;
|
using BLL;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
|
|
@ -62,7 +63,33 @@ namespace FineUIPro.Web.DataShow
|
||||||
Grid1.RecordCount = tb.Rows.Count;
|
Grid1.RecordCount = tb.Rows.Count;
|
||||||
var table = this.GetPagedDataTable(Grid1, tb);
|
var table = this.GetPagedDataTable(Grid1, tb);
|
||||||
Grid1.DataSource = table;
|
Grid1.DataSource = table;
|
||||||
Grid1.DataBind();
|
Grid1.DataBind();
|
||||||
|
this.OutputSummaryData(); ///取合计值
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int allCount = 0, okCount = 0, unCount = 0;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 计算合计
|
||||||
|
/// </summary>
|
||||||
|
private void OutputSummaryData()
|
||||||
|
{
|
||||||
|
|
||||||
|
string rate = "0%";
|
||||||
|
unCount = allCount - okCount;
|
||||||
|
if (allCount > 0)
|
||||||
|
{
|
||||||
|
rate = Math.Round(okCount * 1.0 / allCount * 100, 1).ToString() + "%";
|
||||||
|
}
|
||||||
|
JObject summary = new JObject
|
||||||
|
{
|
||||||
|
{ "ProjectName", "合计" },
|
||||||
|
{ "Count1", allCount.ToString() },
|
||||||
|
{ "Count2", okCount.ToString() },
|
||||||
|
{ "Count3", unCount.ToString() },
|
||||||
|
{ "Count4", rate}
|
||||||
|
};
|
||||||
|
Grid1.SummaryData = summary;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
@ -166,7 +193,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
{
|
{
|
||||||
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
||||||
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
||||||
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4");
|
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.States != "4");
|
||||||
if (datetime1.HasValue)
|
if (datetime1.HasValue)
|
||||||
{
|
{
|
||||||
getT = getT.Where(x => x.RegisterDate >= datetime1);
|
getT = getT.Where(x => x.RegisterDate >= datetime1);
|
||||||
|
|
@ -183,7 +210,13 @@ namespace FineUIPro.Web.DataShow
|
||||||
{
|
{
|
||||||
getT = getT.Where(x => x.HazardValue != "3");
|
getT = getT.Where(x => x.HazardValue != "3");
|
||||||
}
|
}
|
||||||
cout1 = getT.Count();
|
allCount = getT.Count();
|
||||||
|
if (allCount > 0)
|
||||||
|
{
|
||||||
|
|
||||||
|
getT = getT.Where(x => x.ProjectId == projectId.ToString());
|
||||||
|
cout1 = getT.Count();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return cout1;
|
return cout1;
|
||||||
}
|
}
|
||||||
|
|
@ -195,7 +228,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
{
|
{
|
||||||
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
||||||
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
||||||
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States == "3");
|
var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.States == "3");
|
||||||
if (datetime1.HasValue)
|
if (datetime1.HasValue)
|
||||||
{
|
{
|
||||||
getT = getT.Where(x => x.RegisterDate >= datetime1);
|
getT = getT.Where(x => x.RegisterDate >= datetime1);
|
||||||
|
|
@ -212,7 +245,14 @@ namespace FineUIPro.Web.DataShow
|
||||||
{
|
{
|
||||||
getT = getT.Where(x => x.HazardValue != "3");
|
getT = getT.Where(x => x.HazardValue != "3");
|
||||||
}
|
}
|
||||||
cout1 = getT.Count();
|
|
||||||
|
|
||||||
|
okCount = getT.Count();
|
||||||
|
if (okCount > 0)
|
||||||
|
{
|
||||||
|
getT = getT.Where(x => x.ProjectId == projectId.ToString());
|
||||||
|
cout1 = getT.Count();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return cout1;
|
return cout1;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,8 @@
|
||||||
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
|
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
|
||||||
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
|
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
|
||||||
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
|
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
|
||||||
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
|
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"
|
||||||
|
EnableSummary="true" SummaryPosition="Bottom">
|
||||||
<Toolbars>
|
<Toolbars>
|
||||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||||
<Items>
|
<Items>
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
using Aspose.Words;
|
using BLL;
|
||||||
using BLL;
|
using Newtonsoft.Json.Linq;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
using System.Data.SqlClient;
|
using System.Data.SqlClient;
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.ServiceModel.Configuration;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace FineUIPro.Web.DataShow
|
namespace FineUIPro.Web.DataShow
|
||||||
{
|
{
|
||||||
|
|
@ -28,9 +25,9 @@ namespace FineUIPro.Web.DataShow
|
||||||
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||||
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
|
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
|
||||||
LargerHazard = (from x in Funs.DB.Solution_LargerHazard
|
LargerHazard = (from x in Funs.DB.Solution_LargerHazard
|
||||||
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
|
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
|
||||||
where y.ProjectState == Const.ProjectState_1
|
where y.ProjectState == Const.ProjectState_1
|
||||||
select x).ToList();
|
select x).ToList();
|
||||||
// 绑定表格t
|
// 绑定表格t
|
||||||
BindGrid();
|
BindGrid();
|
||||||
}
|
}
|
||||||
|
|
@ -58,6 +55,28 @@ namespace FineUIPro.Web.DataShow
|
||||||
var table = this.GetPagedDataTable(Grid1, tb);
|
var table = this.GetPagedDataTable(Grid1, tb);
|
||||||
Grid1.DataSource = table;
|
Grid1.DataSource = table;
|
||||||
Grid1.DataBind();
|
Grid1.DataBind();
|
||||||
|
|
||||||
|
this.OutputSummaryData(); ///取合计值
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int allCount1 = 0, allCount2 = 0, allCount3 = 0, allCount4 = 0, allCount5 = 0, allCount6 = 0;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 计算合计
|
||||||
|
/// </summary>
|
||||||
|
private void OutputSummaryData()
|
||||||
|
{
|
||||||
|
JObject summary = new JObject
|
||||||
|
{
|
||||||
|
{ "ProjectName", "合计" },
|
||||||
|
{ "Count1", allCount1.ToString() },
|
||||||
|
{ "Count2", allCount2.ToString() },
|
||||||
|
{ "Count3", allCount3.ToString() },
|
||||||
|
{ "Count4", allCount4.ToString() },
|
||||||
|
{ "Count5", allCount5.ToString() },
|
||||||
|
{ "Count6", allCount6.ToString() }
|
||||||
|
};
|
||||||
|
Grid1.SummaryData = summary;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
@ -162,9 +181,10 @@ namespace FineUIPro.Web.DataShow
|
||||||
protected int Count1(object projectId)
|
protected int Count1(object projectId)
|
||||||
{
|
{
|
||||||
int cout1 = 0;
|
int cout1 = 0;
|
||||||
|
allCount1= LargerHazard.Where(x => x.IsSuperLargerHazard == false || !x.IsSuperLargerHazard.HasValue ).Count();
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.IsSuperLargerHazard == false).Count();
|
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && (x.IsSuperLargerHazard == false || !x.IsSuperLargerHazard.HasValue)).Count();
|
||||||
}
|
}
|
||||||
return cout1;
|
return cout1;
|
||||||
}
|
}
|
||||||
|
|
@ -177,6 +197,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
protected int Count2(object projectId)
|
protected int Count2(object projectId)
|
||||||
{
|
{
|
||||||
int cout1 = 0;
|
int cout1 = 0;
|
||||||
|
allCount2 = LargerHazard.Where(x => x.IsSuperLargerHazard == true).Count();
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.IsSuperLargerHazard == true).Count();
|
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.IsSuperLargerHazard == true).Count();
|
||||||
|
|
@ -191,6 +212,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
protected int Count3(object projectId)
|
protected int Count3(object projectId)
|
||||||
{
|
{
|
||||||
int cout1 = 0;
|
int cout1 = 0;
|
||||||
|
allCount3 = LargerHazard.Where(x => x.States == Const.State_2).Count();
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_2).Count();
|
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_2).Count();
|
||||||
|
|
@ -206,6 +228,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
protected int Count4(object projectId)
|
protected int Count4(object projectId)
|
||||||
{
|
{
|
||||||
int cout1 = 0;
|
int cout1 = 0;
|
||||||
|
allCount4 = LargerHazard.Where(x => x.States == Const.State_1).Count();
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_1).Count();
|
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_1).Count();
|
||||||
|
|
@ -222,6 +245,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
protected int Count5(object projectId)
|
protected int Count5(object projectId)
|
||||||
{
|
{
|
||||||
int cout1 = 0;
|
int cout1 = 0;
|
||||||
|
allCount5 = LargerHazard.Sum(x => x.TrainPersonNum ?? 0);
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString()).Sum(x=>x.TrainPersonNum ?? 0);
|
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString()).Sum(x=>x.TrainPersonNum ?? 0);
|
||||||
|
|
@ -237,6 +261,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
protected int Count6(object projectId)
|
protected int Count6(object projectId)
|
||||||
{
|
{
|
||||||
int cout1 = 0;
|
int cout1 = 0;
|
||||||
|
allCount6 = LargerHazard.Where(x => x.States == Const.State_3).Count();
|
||||||
if (projectId != null)
|
if (projectId != null)
|
||||||
{
|
{
|
||||||
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_3).Count();
|
cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_3).Count();
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
using BLL;
|
using BLL;
|
||||||
using Model;
|
using Model;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using NPOI.SS.Formula.Functions;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
|
|
@ -57,7 +59,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||||
Grid1.RecordCount = tb.Rows.Count;
|
Grid1.RecordCount = tb.Rows.Count;
|
||||||
Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
|
Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
|
||||||
Grid1.DataBind();
|
Grid1.DataBind();
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,8 @@
|
||||||
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
|
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
|
||||||
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
|
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
|
||||||
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
|
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
|
||||||
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
|
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True"
|
||||||
|
EnableSummary="true" SummaryPosition="Bottom">
|
||||||
<Toolbars>
|
<Toolbars>
|
||||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||||
<Items>
|
<Items>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using BLL;
|
using BLL;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
|
|
@ -63,6 +64,32 @@ namespace FineUIPro.Web.DataShow
|
||||||
var table = this.GetPagedDataTable(Grid1, tb);
|
var table = this.GetPagedDataTable(Grid1, tb);
|
||||||
Grid1.DataSource = table;
|
Grid1.DataSource = table;
|
||||||
Grid1.DataBind();
|
Grid1.DataBind();
|
||||||
|
this.OutputSummaryData(); ///取合计值
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int allCount = 0, okCount = 0, unCount = 0;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 计算合计
|
||||||
|
/// </summary>
|
||||||
|
private void OutputSummaryData()
|
||||||
|
{
|
||||||
|
|
||||||
|
string rate = "0%";
|
||||||
|
unCount = allCount - okCount;
|
||||||
|
if (allCount > 0)
|
||||||
|
{
|
||||||
|
rate = Math.Round(okCount * 1.0 / allCount * 100, 1).ToString() + "%";
|
||||||
|
}
|
||||||
|
JObject summary = new JObject
|
||||||
|
{
|
||||||
|
{ "ProjectName", "合计" },
|
||||||
|
{ "Count1", allCount.ToString() },
|
||||||
|
{ "Count2", okCount.ToString() },
|
||||||
|
{ "Count3", unCount.ToString() },
|
||||||
|
{ "Count4", rate}
|
||||||
|
};
|
||||||
|
Grid1.SummaryData = summary;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
@ -167,7 +194,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
{
|
{
|
||||||
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
||||||
var datetime2 = 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 = from x in Funs.DB.Check_CheckControl select x;
|
||||||
if (datetime1.HasValue)
|
if (datetime1.HasValue)
|
||||||
{
|
{
|
||||||
getT = getT.Where(x => x.CheckDate >= datetime1);
|
getT = getT.Where(x => x.CheckDate >= datetime1);
|
||||||
|
|
@ -177,7 +204,13 @@ namespace FineUIPro.Web.DataShow
|
||||||
getT = getT.Where(x => x.CheckDate <= datetime2);
|
getT = getT.Where(x => x.CheckDate <= datetime2);
|
||||||
}
|
}
|
||||||
|
|
||||||
cout1 = getT.Count();
|
allCount = getT.Count();
|
||||||
|
if (allCount > 0)
|
||||||
|
{
|
||||||
|
|
||||||
|
getT = getT.Where(x => x.ProjectId == projectId.ToString());
|
||||||
|
cout1 = getT.Count();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return cout1;
|
return cout1;
|
||||||
}
|
}
|
||||||
|
|
@ -189,7 +222,7 @@ namespace FineUIPro.Web.DataShow
|
||||||
{
|
{
|
||||||
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
||||||
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
|
||||||
var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString() && x.State == "7");
|
var getT = Funs.DB.Check_CheckControl.Where(x => x.State == "7");
|
||||||
if (datetime1.HasValue)
|
if (datetime1.HasValue)
|
||||||
{
|
{
|
||||||
getT = getT.Where(x => x.CheckDate >= datetime1);
|
getT = getT.Where(x => x.CheckDate >= datetime1);
|
||||||
|
|
@ -199,7 +232,13 @@ namespace FineUIPro.Web.DataShow
|
||||||
getT = getT.Where(x => x.CheckDate <= datetime2);
|
getT = getT.Where(x => x.CheckDate <= datetime2);
|
||||||
}
|
}
|
||||||
|
|
||||||
cout1 = getT.Count();
|
okCount = getT.Count();
|
||||||
|
if (allCount > 0)
|
||||||
|
{
|
||||||
|
|
||||||
|
getT = getT.Where(x => x.ProjectId == projectId.ToString());
|
||||||
|
cout1 = getT.Count();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return cout1;
|
return cout1;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue