提交代码
This commit is contained in:
@@ -48,6 +48,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
GridYsc.DataBind();
|
||||
JObject summary = new JObject();
|
||||
summary.Add("AllNum", result.Sum(x => x.AllNum));
|
||||
summary.Add("NotStartedNum", result.Sum(x => x.NotStartedNum));
|
||||
summary.Add("ProgressNum", result.Sum(x => x.ProgressNum));
|
||||
summary.Add("CompleteNum", result.Sum(x => x.CompleteNum));
|
||||
GridYsc.SummaryData = summary;
|
||||
@@ -75,6 +76,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
ProjectId = a.ProjectId,
|
||||
States = a.States,
|
||||
AllNum = a.AllNum,
|
||||
NotStartedNum = a.NotStartedNum,
|
||||
ProgressNum = a.ProgressNum,
|
||||
CompleteNum = a.CompleteNum,
|
||||
CompleteRate = a.CompleteRate,
|
||||
@@ -121,6 +123,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
model.AllNum = itemQueryList.Count(x => x.WorkPackId == itemPack.WorkPackId);
|
||||
model.ProgressNum = 0;
|
||||
model.CompleteNum = 0;
|
||||
model.NotStartedNum = 0;
|
||||
var subsystemids = itemQueryList.ConvertAll(a => a.SubSystemId).Distinct();
|
||||
foreach (var itemsubid in subsystemids)
|
||||
{
|
||||
@@ -148,7 +151,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
}
|
||||
else
|
||||
{
|
||||
model.ProgressNum += 1;
|
||||
model.NotStartedNum += 1;
|
||||
}
|
||||
}
|
||||
var rate = model.CompleteNum > 0 ? (decimal)Math.Round((float)model.CompleteNum / (float)model.AllNum * 100, 2, MidpointRounding.AwayFromZero) : 0;
|
||||
@@ -204,6 +207,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
model.ProjectId = this.CurrUser.LoginProjectId;
|
||||
model.States = 1;
|
||||
model.AllNum = !string.IsNullOrWhiteSpace(values.Value<string>("AllNum")) ? int.Parse(values.Value<string>("AllNum")) : 0;
|
||||
model.NotStartedNum = !string.IsNullOrWhiteSpace(values.Value<string>("NotStartedNum")) ? int.Parse(values.Value<string>("NotStartedNum")) : 0;
|
||||
model.ProgressNum = !string.IsNullOrWhiteSpace(values.Value<string>("ProgressNum")) ? int.Parse(values.Value<string>("ProgressNum")) : 0;
|
||||
model.CompleteNum = !string.IsNullOrWhiteSpace(values.Value<string>("CompleteNum")) ? int.Parse(values.Value<string>("CompleteNum")) : 0;
|
||||
var rate = model.CompleteNum > 0 ? (decimal)Math.Round((float)model.CompleteNum / (float)model.AllNum * 100, 2, MidpointRounding.AwayFromZero) : 0;
|
||||
@@ -255,6 +259,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
ws.SetColumnWidth(1, (20 * 256));
|
||||
ws.SetColumnWidth(2, (20 * 256));
|
||||
ws.SetColumnWidth(3, (20 * 256));
|
||||
ws.SetColumnWidth(4, (20 * 256));
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -268,16 +273,18 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
#region 头部
|
||||
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 3);
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 4);
|
||||
//行1
|
||||
ws.GetRow(0).GetCell(0).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(0).SetCellValue("工作包名称");
|
||||
ws.GetRow(0).GetCell(1).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(1).SetCellValue("全部数量");
|
||||
ws.GetRow(0).GetCell(2).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(2).SetCellValue("进行中数量");
|
||||
ws.GetRow(0).GetCell(2).SetCellValue("未开始数量");
|
||||
ws.GetRow(0).GetCell(3).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(3).SetCellValue("已完成数量");
|
||||
ws.GetRow(0).GetCell(3).SetCellValue("进行中数量");
|
||||
ws.GetRow(0).GetCell(4).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(4).SetCellValue("已完成数量");
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -285,7 +292,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
var start = 1;
|
||||
var end = result.Count;
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 3);
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 4);
|
||||
|
||||
//数据
|
||||
var dataIndex = 1;
|
||||
@@ -293,8 +300,9 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
{
|
||||
ws.GetRow(dataIndex).GetCell(0).SetCellValue(item.WorkPackName);
|
||||
ws.GetRow(dataIndex).GetCell(1).SetCellValue(item.AllNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(2).SetCellValue(item.ProgressNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.CompleteNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(2).SetCellValue(item.NotStartedNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.ProgressNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(4).SetCellValue(item.CompleteNum.ToString());
|
||||
dataIndex++;
|
||||
}
|
||||
|
||||
@@ -302,11 +310,12 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
#region 尾部
|
||||
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 3);
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 4);
|
||||
ws.GetRow(end + 1).GetCell(0).SetCellValue("合计");
|
||||
ws.GetRow(end + 1).GetCell(1).SetCellValue(result.Count > 0 ? result.Sum(x => x.AllNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(2).SetCellValue(result.Count > 0 ? result.Sum(x => x.ProgressNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(3).SetCellValue(result.Count > 0 ? result.Sum(x => x.CompleteNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(2).SetCellValue(result.Count > 0 ? result.Sum(x => x.NotStartedNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(3).SetCellValue(result.Count > 0 ? result.Sum(x => x.ProgressNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(4).SetCellValue(result.Count > 0 ? result.Sum(x => x.CompleteNum).ToString() : "0");
|
||||
|
||||
|
||||
#endregion
|
||||
@@ -351,6 +360,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
JObject summary = new JObject();
|
||||
summary.Add("AllNum", result.Sum(x => x.AllNum));
|
||||
summary.Add("NotStartedNum", result.Sum(x => x.NotStartedNum));
|
||||
summary.Add("ProgressNum", result.Sum(x => x.ProgressNum));
|
||||
summary.Add("CompleteNum", result.Sum(x => x.CompleteNum));
|
||||
GridSc.SummaryData = summary;
|
||||
@@ -378,6 +388,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
ProjectId = a.ProjectId,
|
||||
States = a.States,
|
||||
AllNum = a.AllNum,
|
||||
NotStartedNum = a.NotStartedNum,
|
||||
ProgressNum = a.ProgressNum,
|
||||
CompleteNum = a.CompleteNum,
|
||||
CompleteRate = a.CompleteRate,
|
||||
@@ -419,13 +430,15 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
var itemInspect = inspectlist.FirstOrDefault(x => x.WorkPackId == item.WorkPackId);
|
||||
model.AllNum = itemInspect.AllNum;
|
||||
model.ProgressNum = itemInspect.NoCloseNum;
|
||||
model.NotStartedNum = 0;
|
||||
model.CompleteNum = itemInspect.CloseNum;
|
||||
}
|
||||
else
|
||||
{
|
||||
model.AllNum = 0;
|
||||
model.AllNum = 1;
|
||||
model.ProgressNum = 0;
|
||||
model.CompleteNum = 0;
|
||||
model.NotStartedNum = 1;
|
||||
}
|
||||
model.CompleteRate = model.CompleteNum > 0 ? (decimal)Math.Round((float)model.CompleteNum / (float)model.AllNum, 2, MidpointRounding.AwayFromZero) : 0;
|
||||
model.AddUser = this.CurrUser.UserId;
|
||||
@@ -478,6 +491,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
model.ProjectId = this.CurrUser.LoginProjectId;
|
||||
model.States = 2;
|
||||
model.AllNum = !string.IsNullOrWhiteSpace(values.Value<string>("AllNum")) ? int.Parse(values.Value<string>("AllNum")) : 0;
|
||||
model.NotStartedNum = !string.IsNullOrWhiteSpace(values.Value<string>("NotStartedNum")) ? int.Parse(values.Value<string>("NotStartedNum")) : 0;
|
||||
model.ProgressNum = !string.IsNullOrWhiteSpace(values.Value<string>("ProgressNum")) ? int.Parse(values.Value<string>("ProgressNum")) : 0;
|
||||
model.CompleteNum = !string.IsNullOrWhiteSpace(values.Value<string>("CompleteNum")) ? int.Parse(values.Value<string>("CompleteNum")) : 0;
|
||||
model.CompleteRate = model.CompleteNum > 0 ? (decimal)Math.Round((float)model.CompleteNum / (float)model.AllNum, 2, MidpointRounding.AwayFromZero) : 0;
|
||||
@@ -525,6 +539,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
ws.SetColumnWidth(1, (20 * 256));
|
||||
ws.SetColumnWidth(2, (20 * 256));
|
||||
ws.SetColumnWidth(3, (20 * 256));
|
||||
ws.SetColumnWidth(4, (20 * 256));
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -538,16 +553,18 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
#region 头部
|
||||
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 3);
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, 0, 0, 0, 4);
|
||||
//行1
|
||||
ws.GetRow(0).GetCell(0).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(0).SetCellValue("工作包名称");
|
||||
ws.GetRow(0).GetCell(1).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(1).SetCellValue("全部数量");
|
||||
ws.GetRow(0).GetCell(2).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(2).SetCellValue("进行中数量");
|
||||
ws.GetRow(0).GetCell(2).SetCellValue("未开始数量");
|
||||
ws.GetRow(0).GetCell(3).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(3).SetCellValue("已完成数量");
|
||||
ws.GetRow(0).GetCell(3).SetCellValue("进行中数量");
|
||||
ws.GetRow(0).GetCell(4).CellStyle = styleBold;
|
||||
ws.GetRow(0).GetCell(4).SetCellValue("已完成数量");
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -555,7 +572,7 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
var start = 1;
|
||||
var end = result.Count;
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 3);
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, start, end, 0, 4);
|
||||
|
||||
//数据
|
||||
var dataIndex = 1;
|
||||
@@ -563,8 +580,9 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
{
|
||||
ws.GetRow(dataIndex).GetCell(0).SetCellValue(item.WorkPackName);
|
||||
ws.GetRow(dataIndex).GetCell(1).SetCellValue(item.AllNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(2).SetCellValue(item.ProgressNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.CompleteNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(2).SetCellValue(item.NotStartedNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(3).SetCellValue(item.ProgressNum.ToString());
|
||||
ws.GetRow(dataIndex).GetCell(4).SetCellValue(item.CompleteNum.ToString());
|
||||
dataIndex++;
|
||||
}
|
||||
|
||||
@@ -572,12 +590,12 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
#region 尾部
|
||||
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 3);
|
||||
ws = ExcelCreateRowTitle(ws, hssfworkbook, style, end + 1, end + 1, 0, 4);
|
||||
ws.GetRow(end + 1).GetCell(0).SetCellValue("合计");
|
||||
ws.GetRow(end + 1).GetCell(1).SetCellValue(result.Count > 0 ? result.Sum(x => x.AllNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(2).SetCellValue(result.Count > 0 ? result.Sum(x => x.ProgressNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(3).SetCellValue(result.Count > 0 ? result.Sum(x => x.CompleteNum).ToString() : "0");
|
||||
|
||||
ws.GetRow(end + 1).GetCell(2).SetCellValue(result.Count > 0 ? result.Sum(x => x.NotStartedNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(3).SetCellValue(result.Count > 0 ? result.Sum(x => x.ProgressNum).ToString() : "0");
|
||||
ws.GetRow(end + 1).GetCell(4).SetCellValue(result.Count > 0 ? result.Sum(x => x.CompleteNum).ToString() : "0");
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
Reference in New Issue
Block a user