Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
aa12061f
Commit
aa12061f
authored
Sep 03, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
excel调整
parent
a8a5bfa3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
FirstShopListModule.cs
Mall.Module.TradePavilion/FirstShopListModule.cs
+4
-4
TradeController.cs
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
+4
-0
No files found.
Mall.Module.TradePavilion/FirstShopListModule.cs
View file @
aa12061f
...
...
@@ -552,9 +552,9 @@ namespace Mall.Module.TradePavilion
ExcelDataSource
header
=
new
ExcelDataSource
()
{
ExcelRows
=
new
List
<
ExcelColumn
>(
30
)
{
new
ExcelColumn
(
value
:
"企业名称"
)
{
CellWidth
=
1
5
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"企业名称"
)
{
CellWidth
=
2
5
,
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
};
...
...
@@ -605,7 +605,7 @@ namespace Mall.Module.TradePavilion
else
{
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
)
{
});
}
...
...
@@ -638,7 +638,7 @@ namespace Mall.Module.TradePavilion
ExcelDataSource
header
=
new
ExcelDataSource
()
{
ExcelRows
=
new
List
<
ExcelColumn
>(
30
)
{
new
ExcelColumn
(
value
:
"企业名称"
)
{
CellWidth
=
1
5
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
}
new
ExcelColumn
(
value
:
"企业名称"
)
{
CellWidth
=
2
5
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
}
},
ColumnHight
=
30
};
...
...
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @
aa12061f
...
...
@@ -2265,6 +2265,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
x
.
UserId
,
x
.
UserName
,
x
.
UserIcon
,
x
.
ObjectType
,
x
.
ObjectId
,
x
.
Content
,
x
.
Reviews
,
x
.
Rank
,
...
...
@@ -2273,6 +2275,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
x
.
CandidateState
,
x
.
RankListState
,
x
.
CompanyName
,
x
.
Principal
,
x
.
Mobile
,
x
.
ObjectName
,
x
.
ObjectIcon
,
CreateDate
=
x
.
CreateDate
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment