|
@@ -3036,32 +3036,33 @@ namespace Hotline.Application.StatisticalReport
|
|
|
.ToListAsync();
|
|
|
data = list.ToDataTable("HotspotStatistics");
|
|
|
|
|
|
- data.Columns["HotspotName"].SetOrdinal(0);
|
|
|
+ data.Columns["Name"].SetOrdinal(0);
|
|
|
data.Columns["OneHotspotName"].SetOrdinal(1);
|
|
|
data.Columns["TwoHotspotName"].SetOrdinal(2);
|
|
|
data.Columns["ThreeHotspotName"].SetOrdinal(3);
|
|
|
data.Columns["FourHotspotName"].SetOrdinal(4);
|
|
|
data.Columns["FiveHotspotName"].SetOrdinal(5);
|
|
|
data.Columns["SumCount"].ColumnName = "分类统计";
|
|
|
- data.Columns["HotspotName"].ColumnName = "热点名称";
|
|
|
+ data.Columns["Name"].ColumnName = "热点名称";
|
|
|
data.Columns["OneHotspotName"].ColumnName = "一级热点";
|
|
|
data.Columns["TwoHotspotName"].ColumnName = "二级热点";
|
|
|
data.Columns["ThreeHotspotName"].ColumnName = "三级热点";
|
|
|
data.Columns["FourHotspotName"].ColumnName = "四级热点";
|
|
|
data.Columns["FiveHotspotName"].ColumnName = "五级热点";
|
|
|
data.Columns.Remove("HotSpotFullName");
|
|
|
+ data.Columns.Remove("HotspotName");
|
|
|
//data.Columns["HotSpotFullName"].ColumnName = "热点分级";
|
|
|
//合计
|
|
|
- DataRow sumRow = data.NewRow();
|
|
|
- sumRow["热点名称"] = "合计";
|
|
|
- decimal totalAmount = 0;
|
|
|
- foreach (DataRow row in data.Rows)
|
|
|
- {
|
|
|
- totalAmount += Convert.ToDecimal(row["分类统计"]);
|
|
|
- }
|
|
|
- sumRow["分类统计"] = totalAmount;
|
|
|
- data.Rows.Add(sumRow);
|
|
|
- return data;
|
|
|
+ //DataRow sumRow = data.NewRow();
|
|
|
+ // sumRow["热点名称"] = "合计";
|
|
|
+ // decimal totalAmount = 0;
|
|
|
+ // foreach (DataRow row in data.Rows)
|
|
|
+ // {
|
|
|
+ // totalAmount += Convert.ToDecimal(row["分类统计"]);
|
|
|
+ // }
|
|
|
+ // sumRow["分类统计"] = totalAmount;
|
|
|
+ // data.Rows.Add(sumRow);
|
|
|
+ return data;
|
|
|
}
|
|
|
}
|
|
|
}
|