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

20240417 质量月报

Browse Source
This commit is contained in:
毕文静
2024-04-17 15:00:48 +08:00
parent dd3878fd82
commit e3868bc164
15 changed files with 974 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+51 -29
View File
@@ -1344,7 +1344,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-1 土建
var TJInspection = reportItem.Where(x => x.ReType == "10-1").ToList();
if (TJInspection.Count > 0)
if (TJInspection != null || TJInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1472,7 +1472,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-2 设备
var SBInspection = reportItem.Where(x => x.ReType == "10-2").ToList();
if (SBInspection.Count > 0)
if (SBInspection != null || SBInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1600,7 +1600,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-3 管道
var GDInspection = reportItem.Where(x => x.ReType == "10-3").ToList();
if (GDInspection.Count > 0)
if (GDInspection != null || GDInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1728,7 +1728,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-4 电气
var DQInspection = reportItem.Where(x => x.ReType == "10-4").ToList();
if (DQInspection.Count > 0)
if (DQInspection != null || DQInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1856,7 +1856,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-5.仪表
var YBInspection = reportItem.Where(x => x.ReType == "10-5").ToList();
if (YBInspection.Count > 0)
if (YBInspection != null || YBInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1984,7 +1984,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-6.防腐
var FFInspection = reportItem.Where(x => x.ReType == "10-6").ToList();
if (FFInspection.Count > 0)
if (FFInspection != null || FFInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -2112,7 +2112,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-7.消防
var XFInspection = reportItem.Where(x => x.ReType == "10-7").ToList();
if (XFInspection.Count > 0)
if (XFInspection != null || XFInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -2240,7 +2240,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10.总数
var InspectionDataInspection = reportItem.Where(x => x.ReType == "10").ToList();
if (InspectionDataInspection.Count > 0)
if (InspectionDataInspection != null || InspectionDataInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -2260,48 +2260,67 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
numberIndex = 1;
decimal? num1 = 0, num2 = 0;
decimal MonthsCountstring = 0, ProjectCountstring = 0;
//decimal? num1 = 0, num2 = 0;
//decimal MonthsCountstring = 0, ProjectCountstring = 0;
int CheckNum = 0, OKNum = 0, TotalCheckNum = 0, TotalOKNum = 0;
string QuantitySum1 = String.Empty;//本月检查合格点数/本月检查点数
string QuantitySum2 = String.Empty;//累计检查合格点数/累计检查点数
foreach (var item in InspectionDataInspection)
{
if (!string.IsNullOrEmpty(item.RectificationRate))
if (string.IsNullOrEmpty(item.RectificationRate))
{
MonthsCountstring = Convert.ToDecimal(item.RectificationRate.Replace("%", ""));
}
else {
item.RectificationRate = "0%";
MonthsCountstring= Convert.ToDecimal(item.RectificationRate.Replace("%", ""));
}
if (!string.IsNullOrEmpty(item.TotationRate))
if (string.IsNullOrEmpty(item.TotationRate))
{
ProjectCountstring = Convert.ToDecimal(item.TotationRate.Replace("%", ""));
}
else {
item.TotationRate = "0%";
ProjectCountstring = Convert.ToDecimal(item.TotationRate.Replace("%", ""));
}
//创建行
Row row = new Row(doc);
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
row.Cells.Add(CreateCell(item.RectificationRate.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
row.Cells.Add(CreateCell(item.TotationRate.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
row.Cells.Add(CreateCell(Convert.ToString(item.RectificationRate), doc, table.FirstRow.Cells[2].CellFormat.Width));
row.Cells.Add(CreateCell(Convert.ToString(item.TotationRate), doc, table.FirstRow.Cells[3].CellFormat.Width));
row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[4].CellFormat.Width));
table.Rows.Insert(numberIndex, row);
num1 += MonthsCountstring;
num2 += ProjectCountstring;
//num1 += MonthsCountstring;
//num2 += ProjectCountstring;
CheckNum += Convert.ToInt32(item.MonthsCount);
OKNum += Convert.ToInt32(item.ProjectCount);
TotalCheckNum += Convert.ToInt32(item.MonthsBackCount);
TotalOKNum += Convert.ToInt32(item.TotalNoBackCount);
numberIndex += 1;
}
//自动设置表格样式
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
if (CheckNum != 0)//被除数不能为零
{
QuantitySum1 = Math.Round((decimal)OKNum / (decimal)CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
}
else
{
QuantitySum1 = "0%";
}
if (TotalCheckNum != 0)//被除数不能为零
{
QuantitySum2 = Math.Round((decimal)TotalOKNum / (decimal)TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
}
else
{
QuantitySum2 = "0%";
}
//创建合计
Row rowhj = new Row(doc);
rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[0].CellFormat.Width));
rowhj.Cells.Add(CreateCell("合计", doc, table.FirstRow.Cells[1].CellFormat.Width));
rowhj.Cells.Add(CreateCell(num1.ToString() + "%", doc, table.FirstRow.Cells[2].CellFormat.Width));
rowhj.Cells.Add(CreateCell(num2.ToString() + "%", doc, table.FirstRow.Cells[3].CellFormat.Width));
rowhj.Cells.Add(CreateCell(QuantitySum1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
rowhj.Cells.Add(CreateCell(QuantitySum2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[4].CellFormat.Width));
table.Rows.Insert(numberIndex, rowhj);
@@ -2473,7 +2492,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
rowhj.Cells.Add(CreateCell(num3.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
rowhj.Cells.Add(CreateCell(num1.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
rowhj.Cells.Add(CreateCell(num2.ToString(), doc, table.FirstRow.Cells[4].CellFormat.Width));
rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[4].CellFormat.Width));
rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[5].CellFormat.Width));
table.Rows.Insert(numberIndex, rowhj);
//自动设置表格样式
@@ -3026,8 +3045,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 设置页眉上的数据
whileIndex = 1;
table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, 1, true);
//业主名称
table.Rows[0].Cells[2].FirstParagraph.Runs[0].Text = unitsYz.UnitName;
if (unitsYz != null)
{
//业主名称
table.Rows[0].Cells[2].FirstParagraph.Runs[0].Text = unitsYz.UnitName;
}
//项目号
table.Rows[0].Cells[4].FirstParagraph.Runs[0].Text = pModel.ProjectCode;
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+12
View File
@@ -1318,6 +1318,18 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="CheckNum" DataField="CheckNum" Hidden="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" Hidden="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="OKNum" DataField="OKNum" Hidden="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" Hidden="true"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+16 -3
View File
@@ -2781,6 +2781,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//保存9.计量器具报验管理情况
saveMeasuringInspection();
//保存10.现场质量共检数据
saveTjInspection();
saveSbInspection();
saveGDInspection();
saveDQInspection();
saveYBInspection();
saveFFInspection();
saveXFInspection();
saveInspectionDataInspection();
//保存11.压力管道监检情况
savePressureInspection();
@@ -3457,10 +3464,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ReportId = ReportId,
ReType = "10",
ContentName = values.Value<string>("WorkName"),
RectificationRate = values.Value<string>("OneOKRate"),
TotationRate = values.Value<string>("TotalOneOKRate"),
MonthsCount = values.Value<int>("CheckNum"), //当前检查点数
MonthsBackCount = values.Value<int>("TotalCheckNum"),//累计点数
Remarks = values.Value<string>("Remarks"),
ProjectCount = values.Value<int>("OKNum"),//当前合格点数
TotalNoBackCount = values.Value<int>("TotalOKNum"),//累计合格点数
RectificationRate = values.Value<string>("OneOKRate"),//本月合格点数
TotationRate = values.Value<string>("TotalOneOKRate"),
Remarks = values.Value<string>("Remarks"),//本月累计合格点数
};
if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0)
{
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
+266 -13
View File
@@ -311,6 +311,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//保存9.计量器具报验管理情况
saveMeasuringInspection();
//保存10.现场质量共检数据
saveTjInspection();
saveSbInspection();
saveGDInspection();
saveDQInspection();
saveYBInspection();
saveFFInspection();
saveXFInspection();
saveInspectionDataInspection();
//保存11.压力管道监检情况
savePressureInspection();
@@ -450,7 +457,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载13.特种设备监检情况
loadSpecialInspection(objType);
////加载14.NCR管理情况
loadNcrManagementInspection();
loadNcrManagementInspection(objType);
//加载15.质量巡检情况
loadQualityInspection(objType);
@@ -1083,7 +1090,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <summary>
/// NCR管理情况
/// </summary>
void loadNcrManagementInspection()
void loadNcrManagementInspection(string objType)
{
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
@@ -1121,7 +1128,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
u.UnitId,
u.UnitName,
c.IssuedDate,
c.Status
c.Status,
c.ImplementationFrontState,
};
var AllList = query.ToList();
@@ -1131,9 +1139,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
NCRStatisc.Id = Guid.NewGuid().ToString();
NCRStatisc.WorkName = item.UnitName;
NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
//NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
//NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
NCRStatisc.CheckNum = AllList.Count();
if (NCRStatisc.CheckNum != 0)//被除数不能为零
{
NCRStatisc.OKRate = Math.Round((double)NCRStatisc.OKNum / (double)NCRStatisc.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
@@ -1142,11 +1154,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
NCRStatisc.OKRate = "0%";
}
StatisticsList.Add(NCRStatisc);
CurrentPeriodOkNumSum += NCRStatisc.CurrentPeriodOkNum;
OKNumSum += NCRStatisc.OKNum;
CheckNumSum += NCRStatisc.CheckNum;
CheckNumSum += NCRStatisc.CheckNum;
i++;
}
@@ -1171,8 +1184,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
summary.Add("OKRate", OKRateSum.ToString());
gvNcrManagementInspection.SummaryData = summary;
}
#endregion
}
#endregion
#region 15.质量巡检情况 gvQualityInspection方法
/// <summary>
@@ -1590,6 +1603,246 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
#region 10.现场质量共检数据
void saveTjInspection() //检验批统计:土建
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = gvTj.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
ReportId = ReportId,
ReType = "10-1",
ContentName = values.Value<string>("WorkName"),
MonthsCount = values.Value<int>("CheckNum"), //当前检查点数
MonthsBackCount = values.Value<int>("TotalCheckNum"),//累计点数
ProjectCount = values.Value<int>("OKNum"),//当前合格点数
TotalNoBackCount = values.Value<int>("TotalOKNum"),//累计合格点数
RectificationRate = values.Value<string>("OneOKRate"),//本月合格点数
Remarks = values.Value<string>("TotalOneOKRate"),//本月累计合格点数
};
if (gvTj.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = gvTj.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
void saveSbInspection() //检验批统计:设备
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvSb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
ReportId = ReportId,
ReType = "10-2",
ContentName = values.Value<string>("WorkName"),
MonthsCount = values.Value<int>("CheckNum"), //当前检查点数
MonthsBackCount = values.Value<int>("TotalCheckNum"),//累计点数
ProjectCount = values.Value<int>("OKNum"),//当前合格点数
TotalNoBackCount = values.Value<int>("TotalOKNum"),//累计合格点数
RectificationRate = values.Value<string>("OneOKRate"),//本月合格点数
Remarks = values.Value<string>("TotalOneOKRate"),//本月累计合格点数
};
if (GvSb.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = GvSb.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
void saveGDInspection() //检验批统计:管道
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvGD.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
ReportId = ReportId,
ReType = "10-3",
ContentName = values.Value<string>("WorkName"),
MonthsCount = values.Value<int>("CheckNum"), //当前检查点数
MonthsBackCount = values.Value<int>("TotalCheckNum"),//累计点数
ProjectCount = values.Value<int>("OKNum"),//当前合格点数
TotalNoBackCount = values.Value<int>("TotalOKNum"),//累计合格点数
RectificationRate = values.Value<string>("OneOKRate"),//本月合格点数
Remarks = values.Value<string>("TotalOneOKRate"),//本月累计合格点数
};
if (GvGD.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = GvGD.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
void saveDQInspection() //检验批统计:电气
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvDq.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
ReportId = ReportId,
ReType = "10-4",
ContentName = values.Value<string>("WorkName"),
MonthsCount = values.Value<int>("CheckNum"), //当前检查点数
MonthsBackCount = values.Value<int>("TotalCheckNum"),//累计点数
ProjectCount = values.Value<int>("OKNum"),//当前合格点数
TotalNoBackCount = values.Value<int>("TotalOKNum"),//累计合格点数
RectificationRate = values.Value<string>("OneOKRate"),//本月合格点数
Remarks = values.Value<string>("TotalOneOKRate"),//本月累计合格点数
};
if (GvDq.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = GvDq.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
void saveYBInspection() //检验批统计:仪表
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvYb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
ReportId = ReportId,
ReType = "10-5",
ContentName = values.Value<string>("WorkName"),
MonthsCount = values.Value<int>("CheckNum"), //当前检查点数
MonthsBackCount = values.Value<int>("TotalCheckNum"),//累计点数
ProjectCount = values.Value<int>("OKNum"),//当前合格点数
TotalNoBackCount = values.Value<int>("TotalOKNum"),//累计合格点数
RectificationRate = values.Value<string>("OneOKRate"),//本月合格点数
Remarks = values.Value<string>("TotalOneOKRate"),//本月累计合格点数
};
if (GvYb.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = GvYb.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
void saveFFInspection() //检验批统计:防腐
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvFf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
ReportId = ReportId,
ReType = "10-6",
ContentName = values.Value<string>("WorkName"),
MonthsCount = values.Value<int>("CheckNum"), //当前检查点数
MonthsBackCount = values.Value<int>("TotalCheckNum"),//累计点数
ProjectCount = values.Value<int>("OKNum"),//当前合格点数
TotalNoBackCount = values.Value<int>("TotalOKNum"),//累计合格点数
RectificationRate = values.Value<string>("OneOKRate"),//本月合格点数
Remarks = values.Value<string>("TotalOneOKRate"),//本月累计合格点数
};
if (GvFf.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = GvFf.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
void saveXFInspection() //检验批统计:消防
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvXf.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
{
ReportId = ReportId,
ReType = "10-7",
ContentName = values.Value<string>("WorkName"),
MonthsCount = values.Value<int>("CheckNum"), //当前检查点数
MonthsBackCount = values.Value<int>("TotalCheckNum"),//累计点数
ProjectCount = values.Value<int>("OKNum"),//当前合格点数
TotalNoBackCount = values.Value<int>("TotalOKNum"),//累计合格点数
RectificationRate = values.Value<string>("OneOKRate"),//本月合格点数
Remarks = values.Value<string>("TotalOneOKRate"),//本月累计合格点数
};
if (GvXf.Rows[rowIndex].DataKeys.Length > 0)
{
newDetail.Id = GvXf.Rows[rowIndex].DataKeys[0].ToString();
}
detailLists.Add(newDetail);
}
if (detailLists.Count > 0)
{
Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
Funs.DB.SubmitChanges();
}
}
void saveInspectionDataInspection()
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
@@ -1602,11 +1855,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
ReportId = ReportId,
ReType = "10",
ContentName = values.Value<string>("ContentName"),
MonthsCount = values.Value<int>("MonthsCount"),
ProjectCount = values.Value<int>("ProjectCount"),
//RectificationRate = values.Value<string>("RectificationRate"),
Remarks = values.Value<string>("Remarks")
ContentName = values.Value<string>("WorkName"),
RectificationRate = values.Value<string>("OneOKRate"),
TotationRate = values.Value<string>("TotalOneOKRate"),
Remarks = values.Value<string>("Remarks"),
};
if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0)
{