提交代码
This commit is contained in:
@@ -180,6 +180,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
GridPreRun.DataBind();
|
||||
JObject summary = new JObject();
|
||||
summary.Add("WorkPackNum", result.Sum(x => x.WorkPackNum));
|
||||
summary.Add("WorkPackNotStartedNum", result.Sum(x => x.WorkPackNotStartedNum));
|
||||
summary.Add("WorkPackNoCloseNum", result.Sum(x => x.WorkPackNoCloseNum));
|
||||
summary.Add("WorkPackCloseNum", result.Sum(x => x.WorkPackCloseNum));
|
||||
summary.Add("InspectNum", result.Sum(x => x.InspectNum));
|
||||
@@ -222,6 +223,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
ws.SetColumnWidth(8, (20 * 256));
|
||||
ws.SetColumnWidth(9, (20 * 256));
|
||||
ws.SetColumnWidth(10, (20 * 256));
|
||||
ws.SetColumnWidth(11, (20 * 256));
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -235,7 +237,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
#region 头部
|
||||
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 10);
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 11);
|
||||
//行1
|
||||
ws.GetRow(0).GetCell(0).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(0).SetCellValue("工作包名称");
|
||||
@@ -250,15 +252,17 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
ws.GetRow(0).GetCell(5).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(5).SetCellValue("工作包数量");
|
||||
ws.GetRow(0).GetCell(6).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(6).SetCellValue("工作包未关闭数量");
|
||||
ws.GetRow(0).GetCell(6).SetCellValue("工作包未开始数量");
|
||||
ws.GetRow(0).GetCell(7).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(7).SetCellValue("工作包已关闭数量");
|
||||
ws.GetRow(0).GetCell(7).SetCellValue("工作包未关闭数量");
|
||||
ws.GetRow(0).GetCell(8).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(8).SetCellValue("检查表数量");
|
||||
ws.GetRow(0).GetCell(8).SetCellValue("工作包已关闭数量");
|
||||
ws.GetRow(0).GetCell(9).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(9).SetCellValue("检查表未关闭数量");
|
||||
ws.GetRow(0).GetCell(9).SetCellValue("检查表数量");
|
||||
ws.GetRow(0).GetCell(10).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(10).SetCellValue("检查表已关闭数量");
|
||||
ws.GetRow(0).GetCell(10).SetCellValue("检查表未关闭数量");
|
||||
ws.GetRow(0).GetCell(11).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(11).SetCellValue("检查表已关闭数量");
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -266,7 +270,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
var start = 1;
|
||||
var end = result.Count;
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 10);
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 11);
|
||||
|
||||
//数据
|
||||
var dataIndex = 1;
|
||||
@@ -278,11 +282,12 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.SystemName);
|
||||
ws.GetRow(dataIndex).GetCell(4).SetCellValue(item.SubsystemName);
|
||||
ws.GetRow(dataIndex).GetCell(5).SetCellValue(item.WorkPackNum);
|
||||
ws.GetRow(dataIndex).GetCell(6).SetCellValue(item.WorkPackNoCloseNum);
|
||||
ws.GetRow(dataIndex).GetCell(7).SetCellValue(item.WorkPackCloseNum);
|
||||
ws.GetRow(dataIndex).GetCell(8).SetCellValue(item.InspectNum);
|
||||
ws.GetRow(dataIndex).GetCell(9).SetCellValue(item.InspectNoCloseNum);
|
||||
ws.GetRow(dataIndex).GetCell(10).SetCellValue(item.InspectCloseNum);
|
||||
ws.GetRow(dataIndex).GetCell(6).SetCellValue(item.WorkPackNotStartedNum);
|
||||
ws.GetRow(dataIndex).GetCell(7).SetCellValue(item.WorkPackNoCloseNum);
|
||||
ws.GetRow(dataIndex).GetCell(8).SetCellValue(item.WorkPackCloseNum);
|
||||
ws.GetRow(dataIndex).GetCell(9).SetCellValue(item.InspectNum);
|
||||
ws.GetRow(dataIndex).GetCell(10).SetCellValue(item.InspectNoCloseNum);
|
||||
ws.GetRow(dataIndex).GetCell(11).SetCellValue(item.InspectCloseNum);
|
||||
dataIndex++;
|
||||
}
|
||||
|
||||
@@ -290,16 +295,17 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
#region 尾部
|
||||
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 10);
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 11);
|
||||
var region = new CellRangeAddress(end + 1, end + 1, 0, 4);
|
||||
ws.AddMergedRegion(region);
|
||||
ws.GetRow(end + 1).GetCell(0).SetCellValue("合计");
|
||||
ws.GetRow(end + 1).GetCell(5).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(6).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNoCloseNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(7).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackCloseNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(8).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(9).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNoCloseNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(10).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectCloseNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(6).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNotStartedNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(7).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackNoCloseNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(8).SetCellValue(result.Count > 0 ? result.Sum(x => x.WorkPackCloseNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(9).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(10).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectNoCloseNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(11).SetCellValue(result.Count > 0 ? result.Sum(x => x.InspectCloseNum).ToString() : "0");
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -438,6 +444,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
}
|
||||
model.WorkPackCloseNum = 0;
|
||||
model.WorkPackNoCloseNum = 0;
|
||||
model.WorkPackNotStartedNum = 0;
|
||||
var subsystemids = itemQueryList.ConvertAll(a => a.SubSystemId).Distinct();
|
||||
foreach (var itemsubid in subsystemids)
|
||||
{
|
||||
@@ -465,7 +472,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
}
|
||||
else
|
||||
{
|
||||
model.WorkPackNoCloseNum += 1;
|
||||
model.WorkPackNotStartedNum += 1;
|
||||
}
|
||||
}
|
||||
list.Add(model);
|
||||
@@ -512,11 +519,11 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
/// </summary>
|
||||
public string AllNum { get; set; }
|
||||
/// <summary>
|
||||
/// 未关闭任务单数量
|
||||
/// 未关闭数量
|
||||
/// </summary>
|
||||
public string NoCloseNum { get; set; }
|
||||
/// <summary>
|
||||
/// 已关闭任务单数量
|
||||
/// 已关闭数量
|
||||
/// </summary>
|
||||
public string CloseNum { get; set; }
|
||||
}
|
||||
@@ -579,6 +586,10 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
/// </summary>
|
||||
public int WorkPackNoCloseNum { get; set; }
|
||||
/// <summary>
|
||||
/// 工作包未开始数量
|
||||
/// </summary>
|
||||
public int WorkPackNotStartedNum { get; set; }
|
||||
/// <summary>
|
||||
/// 工作包已关闭数量
|
||||
/// </summary>
|
||||
public int WorkPackCloseNum { get; set; }
|
||||
|
||||
Reference in New Issue
Block a user