Commit 9afa17cf authored by 吴春's avatar 吴春
parents 68d59e46 0a84e487
...@@ -141,6 +141,11 @@ namespace Mall.Model.Extend.TradePavilion ...@@ -141,6 +141,11 @@ namespace Mall.Model.Extend.TradePavilion
/// </summary> /// </summary>
public int FileCount { get; set; } public int FileCount { get; set; }
/// <summary>
/// 上传文件类型
/// </summary>
public string FileType { get; set; }
/// <summary> /// <summary>
/// 上传文件大小M /// 上传文件大小M
/// </summary> /// </summary>
......
...@@ -205,6 +205,15 @@ namespace Mall.Module.TradePavilion ...@@ -205,6 +205,15 @@ namespace Mall.Module.TradePavilion
} }
dataItem.CompData = videoItem; dataItem.CompData = videoItem;
break; break;
//通用上传组件
case "CommonUploadComp":
UploadItem commonUpload = GetUploadItem(compData);
if (!isGetAnswer)
{
commonUpload.FileList = new List<string>();
}
dataItem.CompData = commonUpload;
break;
} }
dataList.Add(dataItem); dataList.Add(dataItem);
} }
...@@ -290,6 +299,7 @@ namespace Mall.Module.TradePavilion ...@@ -290,6 +299,7 @@ namespace Mall.Module.TradePavilion
{ {
Name = uploadObj.GetStringValue("Name"), Name = uploadObj.GetStringValue("Name"),
FileCount = uploadObj.GetInt("FileCount"), FileCount = uploadObj.GetInt("FileCount"),
FileType = uploadObj.GetStringValue("FileType"),
FileSizeLimit = uploadObj.GetInt("FileSizeLimit"), FileSizeLimit = uploadObj.GetInt("FileSizeLimit"),
Remark = uploadObj.GetStringValue("Remark"), Remark = uploadObj.GetStringValue("Remark"),
FileList = new List<string>(), FileList = new List<string>(),
......
...@@ -553,9 +553,9 @@ namespace Mall.Module.TradePavilion ...@@ -553,9 +553,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
}; };
...@@ -607,7 +607,7 @@ namespace Mall.Module.TradePavilion ...@@ -607,7 +607,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) { });
} }
...@@ -640,7 +640,7 @@ namespace Mall.Module.TradePavilion ...@@ -640,7 +640,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")
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
<WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
<WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<ShowAllFiles>false</ShowAllFiles>
</PropertyGroup>
</Project>
\ No newline at end of file
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