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
68d59e46
Commit
68d59e46
authored
Sep 03, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
a8a5bfa3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
160 additions
and
51 deletions
+160
-51
FirstShopListModule.cs
Mall.Module.TradePavilion/FirstShopListModule.cs
+135
-47
TradeController.cs
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
+25
-4
No files found.
Mall.Module.TradePavilion/FirstShopListModule.cs
View file @
68d59e46
This diff is collapsed.
Click to expand it.
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @
68d59e46
...
...
@@ -621,7 +621,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
var
query
=
new
RB_Commerce_Consult_Extend
()
{
LinkMan
=
parms
.
GetStringValue
(
"LinkMan"
),
ActivityId
=
parms
.
GetInt
(
"ActivityId"
)
ActivityId
=
parms
.
GetInt
(
"ActivityId"
)
};
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
RequestParm
.
TenantId
;
...
...
@@ -676,7 +676,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
foreach
(
var
sItem
in
item
.
SignUserList
)
{
var
excelColumns
=
new
List
<
ExcelColumn
>(
30
);
if
(
index
==
0
)
if
(
index
==
0
)
{
excelColumns
.
Add
(
new
ExcelColumn
(
value
:
item
.
UserName
)
{
Rowspan
=
item
.
RowSpan
});
excelColumns
.
Add
(
new
ExcelColumn
(
value
:
item
.
CompanyStatusStr
)
{
Rowspan
=
item
.
RowSpan
});
...
...
@@ -2285,7 +2285,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
FileContentResult
GetFirstShopListEnrollToExcel
()
{
public
FileContentResult
GetFirstShopListEnrollToExcel
()
{
string
ExcelName
=
"榜单报名"
+
DateTime
.
Now
.
ToString
(
"yyyyMMddHHmmss"
)
+
".xls"
;
List
<
ExcelDataSource
>
slist
=
new
List
<
ExcelDataSource
>();
...
...
@@ -2548,7 +2549,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// <summary>
/// 报名列表
word
导出
/// 报名列表
批量
导出
/// </summary>
/// <returns></returns>
[
HttpPost
]
...
...
@@ -2574,6 +2575,26 @@ namespace Mall.WebApi.Controllers.TradePavilion
}
}
/// <summary>
/// 删除生成的zip文件
/// </summary>
/// <returns></returns>
[
HttpPost
]
[
AllowAnonymous
]
public
ApiResult
DelFirstShopEnrollZipExport
()
{
var
req
=
base
.
RequestParm
;
JObject
parms
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
string
ListIds
=
parms
.
GetStringValue
(
"Url"
);
if
(
string
.
IsNullOrWhiteSpace
(
ListIds
))
{
return
ApiResult
.
ParamIsNull
(
"请传递文件路径"
);
}
bool
result
=
firstShopListModule
.
DelFirstShopEnrollZipExport
(
ListIds
);
return
ApiResult
.
Success
(
""
);
}
#
endregion
#
region
心愿单列表
...
...
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