Commit f2ab9559 by guanzhenshan

解决导出显示的列头不对的问题

parent 4e584ac9
...@@ -130,10 +130,12 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers ...@@ -130,10 +130,12 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
DataTable dataTable = new DataTable(); //实例化 DataTable dataTable = new DataTable(); //实例化
var objFirst = obj.FirstOrDefault(); var objFirst = obj.FirstOrDefault();
var jsonData = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(objFirst.jsondata); var jsonData = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(objFirst.jsondata);
var colnames = new List<string>();
foreach (var item in jsonData) foreach (var item in jsonData)
{ {
dataTable.Columns.Add(item.Key, typeof(string)); dataTable.Columns.Add(item.Key, typeof(string));
colnames.Add(item.Key);
} }
foreach (var item in obj) foreach (var item in obj)
...@@ -151,11 +153,11 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers ...@@ -151,11 +153,11 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
dataTable.Rows.Add(dataRow); dataTable.Rows.Add(dataRow);
} }
var colnames = new List<string>();
for (var i = 0; i < dataTable.Columns.Count; i++) //for (var i = 0; i < dataTable.Columns.Count; i++)
{ //{
colnames.Add(dataTable.Columns[i].ColumnName); // colnames.Add(dataTable.Columns[i].ColumnName);
} //}
var listVal = new List<string>(); var listVal = new List<string>();
for (int j = 0; j < dataTable.Rows.Count; j++) for (int j = 0; j < dataTable.Rows.Count; j++)
...@@ -175,7 +177,7 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers ...@@ -175,7 +177,7 @@ namespace Bailun.DC.Web.Areas.DataWareHouse.Controllers
var guid = Guid.NewGuid().ToString(); var guid = Guid.NewGuid().ToString();
var filename = platform+ " " + month + "的账单流水"; var filename = platform+ " " + month + "的账单流水";
var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\"; var filepath = _hostingEnvironment.WebRootPath + "\\Files\\Report\\" + DateTime.Now.ToString("yyyy-MM-dd") + "\\";
ToCSV(listVal, listVal, guid, filepath); ToCSV(listVal, colnames, guid, filepath);
var ms = new System.IO.MemoryStream(); var ms = new System.IO.MemoryStream();
using (var f = new System.IO.FileStream(filepath + guid + ".csv", System.IO.FileMode.Open)) using (var f = new System.IO.FileStream(filepath + guid + ".csv", System.IO.FileMode.Open))
......
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
} }
function ExportCSV() { function ExportCSV() {
var website = $('#website').val(); //var website = $('#website').val();
var month = $('#month').val(); var month = $('#month').val();
if (website == '') { if (website == '') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment