diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index cf6b98db..36efadf3 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -322,14 +322,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew lodAllGrid("0"); } - Grid10.EmptyText = "
无数据
"; - gvTj.EmptyText = "
无数据
"; - GvSb.EmptyText = "
无数据
"; - GvGD.EmptyText = "
无数据
"; - GvDq.EmptyText = "
无数据
"; - GvYb.EmptyText = "
无数据
"; - GvFf.EmptyText = "
无数据
"; - GvXf.EmptyText = "
无数据
"; + //Grid10.EmptyText = "
无数据
"; + //gvTj.EmptyText = "
无数据
"; + //GvSb.EmptyText = "
无数据
"; + //GvGD.EmptyText = "
无数据
"; + //GvDq.EmptyText = "
无数据
"; + //GvYb.EmptyText = "
无数据
"; + //GvFf.EmptyText = "
无数据
"; + //GvXf.EmptyText = "
无数据
"; hidReportId.Value = ReportId; } @@ -1214,8 +1214,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 7.3 无损检测管理 Grid10方法 void loadProcessControl_NondestructiveTest_New() { - DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); - DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + DateTime startDate = Convert.ToDateTime(string.Format(this.txtStartDate.Text.Trim())); + DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59")); var list = new List(); //加载所有施工分包单位 //var units = from x in db.Project_ProjectUnit @@ -1239,8 +1239,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew from u in unitJoin.DefaultIfEmpty() where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId - && c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate <= Convert.ToDateTime(endDate) - + && c.CreateDate >= startDate && c.CreateDate <= endDate orderby c.CreateDate descending select new diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs index 02e01d63..2dfc624b 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs @@ -262,14 +262,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew lodAllGrid("0"); } - Grid10.EmptyText = "
无数据
"; - gvTj.EmptyText = "
无数据
"; - GvSb.EmptyText = "
无数据
"; - GvGD.EmptyText = "
无数据
"; - GvDq.EmptyText = "
无数据
"; - GvYb.EmptyText = "
无数据
"; - GvFf.EmptyText = "
无数据
"; - GvXf.EmptyText = "
无数据
"; + //Grid10.EmptyText = "
无数据
"; + //gvTj.EmptyText = "
无数据
"; + //GvSb.EmptyText = "
无数据
"; + //GvGD.EmptyText = "
无数据
"; + //GvDq.EmptyText = "
无数据
"; + //GvYb.EmptyText = "
无数据
"; + //GvFf.EmptyText = "
无数据
"; + //GvXf.EmptyText = "
无数据
"; hidReportId.Value = ReportId; } @@ -1140,7 +1140,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew void loadProcessControl_NondestructiveTest_New() { DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); - DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(string.Format("{0:yyyy-MM-dd HH:mm:ss}", this.txtEndDate.Text.Trim() + " 23:59:59")); var list = new List(); //加载所有施工分包单位 //var units = from x in db.Project_ProjectUnit @@ -1164,8 +1164,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew from u in unitJoin.DefaultIfEmpty() where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId - && c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate <= Convert.ToDateTime(endDate) - + && c.CreateDate >= startDate && c.CreateDate <= endDate orderby c.CreateDate descending select new diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index d989db4f..59ad2199 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true