Commit 68d59e46 authored by 吴春's avatar 吴春

提交代码

parent a8a5bfa3
......@@ -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 心愿单列表
......
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