Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Extend/TradePavilion/RB_Custom_Form_Extend.cs

@@ -141,6 +141,11 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public int FileCount { get; set; }
 
+        /// <summary>
+        /// 上传文件类型
+        /// </summary>
+        public string FileType { get; set; }
+
         /// <summary>
         /// 上传文件大小M
         /// </summary>

Mall.Module.TradePavilion/CustomFormModule.cs

@@ -205,6 +205,15 @@ namespace Mall.Module.TradePavilion
                                     }
                                     dataItem.CompData = videoItem;
                                     break;
+                                    //通用上传组件
+                                case "CommonUploadComp":
+                                    UploadItem commonUpload = GetUploadItem(compData);
+                                    if (!isGetAnswer)
+                                    {
+                                        commonUpload.FileList = new List<string>();
+                                    }
+                                    dataItem.CompData = commonUpload;
+                                    break;
                             }
                             dataList.Add(dataItem);
                         }
@@ -290,6 +299,7 @@ namespace Mall.Module.TradePavilion
             {
                 Name = uploadObj.GetStringValue("Name"),
                 FileCount = uploadObj.GetInt("FileCount"),
+                FileType = uploadObj.GetStringValue("FileType"),
                 FileSizeLimit = uploadObj.GetInt("FileSizeLimit"),
                 Remark = uploadObj.GetStringValue("Remark"),
                 FileList = new List<string>(),

Mall.Module.TradePavilion/FirstShopListModule.cs

@@ -553,9 +553,9 @@ namespace Mall.Module.TradePavilion
                 ExcelDataSource header = new ExcelDataSource()
                 {
                     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 = 20, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }
                     },
                     ColumnHight = 30
                 };
@@ -607,7 +607,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) { });
                         }
@@ -640,7 +640,7 @@ namespace Mall.Module.TradePavilion
             ExcelDataSource header = new ExcelDataSource()
             {
                 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
             };

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -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")

Mall.WebApi/Mall.WebApi.csproj.user

-<?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