diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 12b89e6b..c268cf80 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -1365,12 +1365,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew c.ProjectId, u.UnitId, u.UnitName, - c.CompileDate + c.InspectionDate }; var AllList = query.ToList(); var monethCount = query - .Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate))); + .Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate))); Model.Report_Construction_Plan model = new Model.Report_Construction_Plan(); @@ -1517,8 +1517,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew CheckLotBindStatisc("PP");//检验批统计:管道 CheckLotBindStatisc("EL");//检验批统计:电气 CheckLotBindStatisc("IN");//检验批统计:仪表 - CheckLotBindStatisc("FF");//检验批统计:反腐 - CheckLotBindStatisc("XF");//检验批统计:消防 + CheckLotBindStatisc("AC");//检验批统计:反腐 + CheckLotBindStatisc("FF");//检验批统计:消防 #region 现场质量共检数据合计 DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); @@ -1548,7 +1548,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew from u in unitJoin.DefaultIfEmpty() select new { - c.CheckDate, + c.InspectionDate, c.ProjectId, u.UnitId, u.UnitName, @@ -1560,7 +1560,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId select new { - x.CheckDate, + x.InspectionDate, x.ProjectId, x.UnitId, x.UnitName, @@ -1568,7 +1568,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew }; var AllList = query.ToList(); var monethCount = query - .Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate))); + .Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate))); Model.CheckStatisc checkStatisc = new Model.CheckStatisc(); @@ -1841,7 +1841,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew GvYb.SummaryData = summary; } //检验批统计:防腐 - if (cNProfessionalCode == "FF") + if (cNProfessionalCode == "AC") { this.GvFf.DataSource = StatisticsList; this.GvFf.DataBind(); @@ -1860,7 +1860,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew GvFf.SummaryData = summary; } //检验批统计:消防 - if (cNProfessionalCode == "XF") + if (cNProfessionalCode == "FF") { this.GvXf.DataSource = StatisticsList; this.GvXf.DataBind(); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs index 23638a38..9cf19e18 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs @@ -69,15 +69,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl strSql += " AND P.CNProfessionalId=@CNProfessionalId"; listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessional.SelectedValue)); } - if (!string.IsNullOrEmpty(txtStarTime.Text.Trim())) + if (!string.IsNullOrEmpty(txtStarTime.Text)) { - strSql += " AND P.InspectionDate >= @InspectionDate"; - listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtStarTime.Text.Trim()))); + strSql += " AND P.InspectionDate >= @startTime"; + listStr.Add(new SqlParameter("@startTime", Funs.GetNewDateTime(txtStarTime.Text))); } - if (!string.IsNullOrEmpty(txtEndTime.Text.Trim())) + if (!string.IsNullOrEmpty(txtEndTime.Text)) { - strSql += " AND P.InspectionDate <= @InspectionDate"; - listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); + strSql += " AND P.InspectionDate <= @endTime"; + listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text))); } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs index f77179e6..6ed00eea 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs @@ -71,13 +71,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl } if (!string.IsNullOrEmpty(txtStarTime.Text.Trim())) { - strSql += " AND P.InspectionDate >= @InspectionDate"; - listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtStarTime.Text.Trim()))); + strSql += " AND P.InspectionDate >= @startTime"; + listStr.Add(new SqlParameter("@startTime", Funs.GetNewDateTime(txtStarTime.Text.Trim()))); } if (!string.IsNullOrEmpty(txtEndTime.Text.Trim())) { - strSql += " AND P.InspectionDate <= @InspectionDate"; - listStr.Add(new SqlParameter("@InspectionDate", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); + strSql += " AND P.InspectionDate <= @endTime"; + listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 28d2afab..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,30 +0,0 @@ - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 BLL.APIGetHttpService.Http(String url, String method, String contenttype, Hashtable header, String data) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\API\APIGetHttpService.cs:行号 62 - 在 BLL.CNCECHSSEWebService.UpCheck_CheckRectify(String checkRectifyId, Sys_User CurrUser) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1302 -出错时间:06/21/2024 15:57:07 -出错时间:06/21/2024 15:57:07 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 BLL.APIGetHttpService.Http(String url, String method, String contenttype, Hashtable header, String data) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\API\APIGetHttpService.cs:行号 62 - 在 BLL.CNCECHSSEWebService.UpCheck_CheckRectify(String checkRectifyId, Sys_User CurrUser) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1302 -出错时间:06/21/2024 16:03:12 -出错时间:06/21/2024 16:03:12 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 BLL.APIGetHttpService.Http(String url, String method, String contenttype, Hashtable header, String data) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\API\APIGetHttpService.cs:行号 62 - 在 BLL.CNCECHSSEWebService.UpCheck_CheckRectify(String checkRectifyId, Sys_User CurrUser) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1302 -出错时间:06/21/2024 16:04:10 -出错时间:06/21/2024 16:04:10 - diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f50b26d3..9fc55c34 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - +