审核详情调整

Mall.Model/Extend/TradePavilion/RB_BuildingApplyFor_Extend.cs

@@ -26,6 +26,7 @@ namespace Mall.Model.Extend.TradePavilion
         /// 轮播图
         /// </summary>
         public List<string> BannerList { get; set; }
+
         /// <summary>
         /// 时间
         /// </summary>

Mall.Model/Extend/TradePavilion/RB_EnterpriseServicesApply_Extend.cs

@@ -16,10 +16,15 @@ namespace Mall.Model.Extend.TradePavilion
     public class RB_EnterpriseServicesApply_Extend : RB_EnterpriseServicesApply
     {
         /// <summary>
-        /// 分类名称
+        /// 企业分类
         /// </summary>
         public string CategoryName { get; set; }
 
+        /// <summary>
+        /// 楼宇等级
+        /// </summary>
+        public string ETypeName { get; set; }
+
         /// <summary>
         /// 时间
         /// </summary>

Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs

@@ -1176,6 +1176,7 @@ namespace Mall.Module.TradePavilion
                 model.CarrierModel = new RB_CarrierEnterpriseApplyFor_Extend();
                 model.EnterpriseServicesModel = new RB_EnterpriseServicesApply_Extend();
                 model.buildingApplyForModel = new RB_BuildingApplyFor_Extend();
+                //品牌
                 if (model.FirstShopType == 1)
                 {
                     var brandList = brandEnterpriseApplyForRepository.GetCarrierEnterpriseApplyForRepository(new RB_BrandEnterpriseApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
@@ -1210,6 +1211,7 @@ namespace Mall.Module.TradePavilion
                         model.BrandModel.ProjectName = model.BrandModel.ProjectType.GetEnumName();
                     }
                 }
+                //载体
                 else if (model.FirstShopType == 2)
                 {
                     var carrierList = carrierEnterpriseApplyForRepository.GetCarrierEnterpriseList(new RB_CarrierEnterpriseApplyFor_Extend() { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
@@ -1234,14 +1236,13 @@ namespace Mall.Module.TradePavilion
                         model.CarrierModel.ProjectName = model.CarrierModel.ProjectType.GetEnumName();
                     }
                 }
+                //企业服务
                 else if (model.FirstShopType == 3)
                 {
                     var brandList = enterpriseServicesApplyRepository.GetEnterpriseServicesApplyRepository(new RB_EnterpriseServicesApply_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
                     if (brandList != null && brandList.Any())
                     {
                         model.EnterpriseServicesModel = brandList.FirstOrDefault();
-
-
                         if (!string.IsNullOrWhiteSpace(model.EnterpriseServicesModel.Banner))
                         {
                             model.EnterpriseServicesModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.EnterpriseServicesModel.Banner);
@@ -1252,21 +1253,20 @@ namespace Mall.Module.TradePavilion
                         }
                     }
                 }
+                //活力楼宇
                 else if (model.FirstShopType == 4)
                 {
                     var brandList = buildingApplyForRepository.GetBuildingRepository(new RB_BuildingApplyFor_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
                     if (brandList != null && brandList.Any())
                     {
                         model.buildingApplyForModel = brandList.FirstOrDefault();
-
-
-                        if (!string.IsNullOrWhiteSpace(model.EnterpriseServicesModel.Banner))
+                        if (!string.IsNullOrWhiteSpace(model.buildingApplyForModel.Banner))
                         {
-                            model.EnterpriseServicesModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.EnterpriseServicesModel.Banner);
+                            model.buildingApplyForModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.buildingApplyForModel.Banner);
                         }
                         else
                         {
-                            model.EnterpriseServicesModel.BannerList = new List<string>();
+                            model.buildingApplyForModel.BannerList = new List<string>();
                         }
                     }
                 }

Mall.Repository/TradePavilion/RB_EnterpriseServicesApplyRepository.cs

@@ -82,7 +82,11 @@ namespace Mall.Repository.TradePavilion
         {
             DynamicParameters parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT a.*,b.ClassName from {TableName} as a LEFT JOIN rb_brandclass as b on a.CategoryId=b.ID   WHERE 1=1 ");
+            builder.Append(@"
+SELECT a.*,b.ClassName AS CategoryName,IFNULL(c.ClassName,'') AS ETypeName
+FROM RB_EnterpriseServicesApply as a LEFT JOIN rb_brandclass as b on a.CategoryId=b.ID
+     LEFT JOIN rb_brandclass as C on a.EType=C.ID   
+WHERE 1=1 ");
 
             builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_EnterpriseServicesApply_Extend.Status), (int)DateStateEnum.Normal);
             builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_EnterpriseServicesApply_Extend.Status), (int)DateStateEnum.Normal);