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

1

Browse Source
This commit is contained in:
夏菊
2025-10-16 10:46:15 +08:00
parent 2f9728e457
commit e48087673e
3 changed files with 47 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+14 -18
View File
@@ -357,6 +357,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
var units21 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
var units22 = units.Where(x => x.UnitId != Const.UnitId_CWCEC && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)).ToList();
var units2 = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2).ToList();
var remarks = loadRemarksDt();
@@ -461,7 +462,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
foreach (var item in units21)
foreach (var item in units22)
{
Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
@@ -529,7 +530,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
foreach (var item in units21)
foreach (var item in units22)
{
Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
model.Id = Guid.NewGuid().ToString();
@@ -1340,7 +1341,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
foreach (var item in units21)
foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -1956,12 +1957,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
foreach (var item in units21)
foreach (var item in units22)
{
Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
checkStatisc.Id = Guid.NewGuid().ToString();
checkStatisc.ReportId = ReportId;
@@ -1971,8 +1968,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
checkStatisc.CheckNum = Quantity1Dic[item.UnitId];
checkStatisc.TotalCheckNum = Quantity2Dic[item.UnitId];
checkStatisc.OKNum = Quantity3Dic[item.UnitId]; ;
checkStatisc.TotalOKNum = Quantity4Dic[item.UnitId]; ;
checkStatisc.TotalOKNum = Quantity4Dic[item.UnitId];
}
if (checkStatisc.CheckNum != 0)//被除数不能为零
{
@@ -2004,8 +2000,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
OKNum += checkStatisc.OKNum;
TotalOKNum += checkStatisc.TotalOKNum;
}
gvInspectionDataInspection.DataSource = list;
@@ -2082,7 +2076,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity2Dic[UnitId] = Quantity2Dic[UnitId] + PressurePipeNumber;
}
foreach (var item in units21)
foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -2158,10 +2152,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + IssuedReportNumber;
}
foreach (var item in units21)
foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
model.ContentName = item.UnitName;
@@ -2238,7 +2230,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity3Dic[UnitId] = Quantity3Dic[UnitId] + MonitoringReportNumber;
}
foreach (var item in units21)
foreach (var item in units22)
{
Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
model.Id = Guid.NewGuid().ToString();
@@ -2334,6 +2326,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
foreach (var item in units)
{
if (item.UnitId == Const.UnitId_CWCEC)
{
continue;
}
Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
NCRStatisc.Id = Guid.NewGuid().ToString();
NCRStatisc.WorkName = item.UnitName;
@@ -2428,7 +2424,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
foreach (var item in units21)
foreach (var item in units22)
{
var ClosedCount = 0;