Commit aa12061f authored by liudong1993's avatar liudong1993

excel调整

parent a8a5bfa3
...@@ -552,9 +552,9 @@ namespace Mall.Module.TradePavilion ...@@ -552,9 +552,9 @@ namespace Mall.Module.TradePavilion
ExcelDataSource header = new ExcelDataSource() ExcelDataSource header = new ExcelDataSource()
{ {
ExcelRows = new List<ExcelColumn>(30) { ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value: "企业名称") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }, new ExcelColumn(value: "企业名称") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "类型") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }, new ExcelColumn(value: "类型") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "对象名称") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER } new ExcelColumn(value: "对象名称") { CellWidth = 20, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }
}, },
ColumnHight = 30 ColumnHight = 30
}; };
...@@ -605,7 +605,7 @@ namespace Mall.Module.TradePavilion ...@@ -605,7 +605,7 @@ namespace Mall.Module.TradePavilion
else else
{ {
var objv = JsonHelper.DeserializeObject<UploadItem>(qitem.CompData.ToString()); var objv = JsonHelper.DeserializeObject<UploadItem>(qitem.CompData.ToString());
value = JsonHelper.Serialize(objv.FileList); value = string.Join(",", objv.FileList);
} }
row.ExcelRows.Add(new ExcelColumn(value: value) { }); row.ExcelRows.Add(new ExcelColumn(value: value) { });
} }
...@@ -638,7 +638,7 @@ namespace Mall.Module.TradePavilion ...@@ -638,7 +638,7 @@ namespace Mall.Module.TradePavilion
ExcelDataSource header = new ExcelDataSource() ExcelDataSource header = new ExcelDataSource()
{ {
ExcelRows = new List<ExcelColumn>(30) { ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value: "企业名称") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER } new ExcelColumn(value: "企业名称") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }
}, },
ColumnHight = 30 ColumnHight = 30
}; };
......
...@@ -2265,6 +2265,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -2265,6 +2265,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
x.UserId, x.UserId,
x.UserName, x.UserName,
x.UserIcon, x.UserIcon,
x.ObjectType,
x.ObjectId,
x.Content, x.Content,
x.Reviews, x.Reviews,
x.Rank, x.Rank,
...@@ -2273,6 +2275,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -2273,6 +2275,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
x.CandidateState, x.CandidateState,
x.RankListState, x.RankListState,
x.CompanyName, x.CompanyName,
x.Principal,
x.Mobile,
x.ObjectName, x.ObjectName,
x.ObjectIcon, x.ObjectIcon,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss") CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
......
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