lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240625 质量月报

Browse Source
This commit is contained in:
毕文静
2024-06-25 22:54:12 +08:00
parent 197b55e6bd
commit 15252bd16e
5 changed files with 20 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+9 -9
View File
@@ -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();
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
+6 -6
View File
@@ -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);
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
+4 -4
View File
@@ -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);