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

Mall.Model/Entity/TradePavilion/RB_Building.cs

@@ -165,5 +165,10 @@ namespace Mall.Model.Entity.TradePavilion
         /// 删除状态
         /// </summary>
         public DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 小程序对应的员工id
+        /// </summary>
+        public int UserId { get; set; }
     }
 }

Mall.Model/Entity/TradePavilion/RB_BuildingApplyFor.cs

+using Mall.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 活力楼宇入住实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_BuildingApplyFor
+    {
+        /// <summary>
+		/// 楼宇主键Id
+		/// </summary>
+		public int ID { get; set; }
+
+        /// <summary>
+        /// 楼宇名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 楼宇图片
+        /// </summary>
+        public string Banner { get; set; }
+
+        /// <summary>
+        /// 楼宇位置
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 经纬度
+        /// </summary>
+        public string LatAndLon { get; set; }
+
+        /// <summary>
+        /// 投运时间
+        /// </summary>
+        public string OperationTime { get; set; }
+
+        /// <summary>
+        /// 楼宇等级
+        /// </summary>
+        public int CategoryId { get; set; }
+
+        /// <summary>
+        /// 面积
+        /// </summary>
+        public string Areas { get; set; }
+
+        /// <summary>
+        /// 楼栋数
+        /// </summary>
+        public string BuildingNum { get; set; }
+
+        /// <summary>
+        /// 楼层数
+        /// </summary>
+        public int FloorNum { get; set; }
+
+        /// <summary>
+        /// 电梯数
+        /// </summary>
+        public int ElevatorNum { get; set; }
+
+        /// <summary>
+        /// 层高
+        /// </summary>
+        public decimal FloorHeight { get; set; }
+
+        /// <summary>
+        /// 开发商
+        /// </summary>
+        public string Developers { get; set; }
+
+        /// <summary>
+        /// 物业公司
+        /// </summary>
+        public string PropertyComp { get; set; }
+
+        /// <summary>
+        /// 销售自持比例
+        /// </summary>
+        public string SaleOrSelf { get; set; }
+
+        /// <summary>
+        /// 是否统一运营(1-是，0-否)
+        /// </summary>
+        public int IsAllOperate { get; set; }
+
+        /// <summary>
+        /// 建设时间
+        /// </summary>
+        public string ConstructionTime { get; set; }
+
+        /// <summary>
+        /// 物业费(元/㎡)
+        /// </summary>
+        public decimal PropertyFee { get; set; }
+
+        /// <summary>
+        /// 月租金(元/㎡)
+        /// </summary>
+        public decimal RentFee { get; set; }
+
+        /// <summary>
+        /// 产业方向
+        /// </summary>
+        public string IndustryDirection { get; set; }
+
+        /// <summary>
+        /// 目标企业招引需求
+        /// </summary>
+        public string BrandDemand { get; set; }
+
+        /// <summary>
+        /// 其他需求
+        /// </summary>
+        public string Other { get; set; }
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string ContactName { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string ContactPhone { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+
+        /// <summary>
+        /// 认证id
+        /// </summary>
+        public int CompanyId { get; set; }
+
+        /// <summary>
+        /// 现有楼宇id
+        /// </summary>
+        public int ExistBuildId { get; set; }
+    }
+}

Mall.Model/Entity/TradePavilion/RB_EnterpriseServices.cs

@@ -126,6 +126,11 @@ namespace Mall.Model.Entity.TradePavilion
         /// </summary>
         public int UpdateBy { get; set; }
 
+        /// <summary>
+        /// 小程序用户id
+        /// </summary>
+        public int UserId { get; set; }
+
         /// <summary>
         /// 修改时间
         /// </summary>

Mall.Model/Entity/TradePavilion/RB_EnterpriseServicesApply.cs

+using Mall.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.TradePavilion
+{
+    /// <summary>
+    /// 【商载通】企业服务入住实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_EnterpriseServicesApply
+    {
+        /// <summary>
+		/// 企业服务主键Id
+		/// </summary>
+		public int ID { get; set; }
+
+        /// <summary>
+        /// 企业名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 企业图片
+        /// </summary>
+        public string Banner { get; set; }
+
+        /// <summary>
+        /// 企业简介
+        /// </summary>
+        public string Introduction { get; set; }
+
+        /// <summary>
+        /// 企业发展意向
+        /// </summary>
+        public string DevIntention { get; set; }
+
+        /// <summary>
+        /// 楼宇位置
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 经纬度
+        /// </summary>
+        public string LatAndLon { get; set; }
+
+        /// <summary>
+        /// 投运时间
+        /// </summary>
+        public string OperationTime { get; set; }
+
+        /// <summary>
+        /// 楼宇等级
+        /// </summary>
+        public int CategoryId { get; set; }
+
+        /// <summary>
+        /// 楼宇装修
+        /// </summary>
+        public string Renovation { get; set; }
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public string Payment { get; set; }
+
+        /// <summary>
+        /// 交房日期
+        /// </summary>
+        public string HandoverDate { get; set; }
+
+        /// <summary>
+        /// 意向楼层
+        /// </summary>
+        public int IntentionalFloor { get; set; }
+
+        /// <summary>
+        /// 电梯数
+        /// </summary>
+        public int ElevatorNum { get; set; }
+
+        /// <summary>
+        /// 物业费(元/㎡)
+        /// </summary>
+        public decimal PropertyFee { get; set; }
+
+        /// <summary>
+        /// 月租金(元/㎡)
+        /// </summary>
+        public decimal RentFee { get; set; }
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string ContactName { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string ContactPhone { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 认证id
+        /// </summary>
+        public int CompanyId { get; set; }
+
+        /// <summary>
+        /// 现有企业服务id
+        /// </summary>
+        public int ExistServiceId { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_BuildingApplyFor_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+using System;
+using System.Collections.Generic;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 活力楼宇入住扩展实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_BuildingApplyFor_Extend : RB_BuildingApplyFor
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 轮播图
+        /// </summary>
+        public List<string> BannerList { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public string EndTime { get; set; }
+    }
+}

Mall.Model/Extend/TradePavilion/RB_CompanyEnterprise_Extend.cs

@@ -20,6 +20,17 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public RB_CarrierEnterpriseApplyFor_Extend CarrierModel { get; set; }
 
+
+        /// <summary>
+        /// 企业服务
+        /// </summary>
+        public RB_EnterpriseServicesApply_Extend EnterpriseServicesModel { get; set; }
+
+        /// <summary>
+        /// 楼宇
+        /// </summary>
+        public RB_BuildingApplyFor_Extend buildingApplyForModel  { get; set; }
+
         /// <summary>
         /// 用户名称
         /// </summary>

Mall.Model/Extend/TradePavilion/RB_EnterpriseServicesApply_Extend.cs

+using Mall.Model.Entity.TradePavilion;
+using NPOI.OpenXmlFormats.Spreadsheet;
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.TradePavilion
+{
+    /// <summary>
+    /// 【商载通】企业服务入住扩展类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_EnterpriseServicesApply_Extend : RB_EnterpriseServicesApply
+    {
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 轮播图
+        /// </summary>
+        public List<string> BannerList { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public string EndTime { get; set; }
+    }
+}

Mall.Repository/TradePavilion/RB_BrandEnterpriseApplyForRepository.cs

@@ -108,6 +108,10 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" AND A.{nameof(RB_BrandEnterpriseApplyFor_Extend.ID)}={query.ID}");
                 }
+                if (query.CompanyId > 0)
+                {
+                    builder.Append($" AND A.{nameof(RB_BrandEnterpriseApplyFor_Extend.CompanyId)}={query.CompanyId}");
+                }
                 if (query.BrandEnterpriseType > 0)
                 {
                     builder.Append($" AND A.{nameof(RB_BrandEnterpriseApplyFor_Extend.BrandEnterpriseType)}={query.BrandEnterpriseType}");

Mall.Repository/TradePavilion/RB_BuildingApplyForRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 活力楼宇仓储层
+    /// </summary>
+    public class RB_BuildingApplyForRepository : BaseRepository<RB_BuildingApplyFor>
+    {
+        /// <summary>
+        /// 获取活力楼宇分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_BuildingApplyFor_Extend> GetBuildingPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_BuildingApplyFor_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM RB_BuildingApplyFor AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.CategoryId), query.CategoryId);
+                }
+                if (query.CompanyId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.CompanyId), query.CompanyId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_BuildingApplyFor_Extend.Name));
+                    parameters.Add("@Name", "%" + query.Name.Trim() + "%");
+                }
+                if (!string.IsNullOrEmpty(query.Address))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Address ", nameof(RB_BuildingApplyFor_Extend.Address));
+                    parameters.Add("@Address", "%" + query.Address.Trim() + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_BuildingApplyFor_Extend.ID));
+            return GetPage<RB_BuildingApplyFor_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取活力楼宇分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_BuildingApplyFor_Extend> GetBuildingRepository( RB_BuildingApplyFor_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM RB_BuildingApplyFor AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.CategoryId), query.CategoryId);
+                }
+                if (query.CompanyId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_BuildingApplyFor_Extend.CompanyId), query.CompanyId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_BuildingApplyFor_Extend.Name));
+                    parameters.Add("@Name", "%" + query.Name.Trim() + "%");
+                }
+                if (!string.IsNullOrEmpty(query.Address))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Address ", nameof(RB_BuildingApplyFor_Extend.Address));
+                    parameters.Add("@Address", "%" + query.Address.Trim() + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_BuildingApplyFor_Extend.ID));
+            return Get<RB_BuildingApplyFor_Extend>( builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_BuildingRepository.cs

@@ -59,5 +59,57 @@ WHERE 1=1
             builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Building_Extend.BuildId));
             return GetPage<RB_Building_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+
+        /// <summary>
+        /// 获取活力楼宇分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Building_Extend> GetBuildingRepository( RB_Building_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM RB_Building AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.CategoryId), query.CategoryId);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Extend.UserId), query.UserId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Building_Extend.Name));
+                    parameters.Add("@Name", "%" + query.Name.Trim() + "%");
+                }
+                if (!string.IsNullOrEmpty(query.Address))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Address ", nameof(RB_Building_Extend.Address));
+                    parameters.Add("@Address", "%" + query.Address.Trim() + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Building_Extend.BuildId));
+            return Get<RB_Building_Extend>( builder.ToString(), parameters).ToList();
+        }
     }
 }

Mall.Repository/TradePavilion/RB_Building_CarrierRepository.cs

@@ -59,6 +59,11 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.OpeningStatus), query.OpeningStatus);
                 }
+                if (query.IsChengDu > -1)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.IsChengDu), query.IsChengDu);
+                }
+                
                 if (query.CategoryId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.CategoryId), query.CategoryId);

Mall.Repository/TradePavilion/RB_EnterpriseServicesApplyRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.TradePavilion;
+using Mall.Model.Extend.TradePavilion;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.TradePavilion
+{
+    /// <summary>
+    /// 商载通企业服务入驻申请仓储类
+    /// </summary>
+    public class RB_EnterpriseServicesApplyRepository : BaseRepository<RB_EnterpriseServicesApply>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_EnterpriseServicesApply); } }
+
+
+        /// <summary>
+        /// 企业服务申请信息列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_EnterpriseServicesApply_Extend> GetEnterpriseServicesApplyPageList(int pageIndex, int pageSize, out long rowCount, RB_EnterpriseServicesApply_Extend query)
+        {
+            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.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);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND A.{nameof(RB_EnterpriseServicesApply_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND A.{nameof(RB_EnterpriseServicesApply_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND A.{nameof(RB_EnterpriseServicesApply_Extend.ID)}={query.ID}");
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_EnterpriseServicesApply_Extend.Name));
+                    parameters.Add("Name", "%" + query.Name.Trim() + "%");
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_EnterpriseServicesApply_Extend.CategoryId), query.CategoryId);
+                }
+
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.Append($" AND a.{nameof(RB_EnterpriseServicesApply_Extend.CreateDate)} >= '{query.StartTime}'");
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.Append($" AND a.{nameof(RB_EnterpriseServicesApply_Extend.CreateDate)} <= '{query.EndTime} 23:59:59'");
+                }
+            }
+            return GetPage<RB_EnterpriseServicesApply_Extend>(pageIndex, pageSize, out rowCount, builder.ToString(), parameters).ToList();
+        }
+
+
+        /// <summary>
+        /// 企业服务申请信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_EnterpriseServicesApply_Extend> GetEnterpriseServicesApplyRepository(RB_EnterpriseServicesApply_Extend query)
+        {
+            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.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);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND A.{nameof(RB_EnterpriseServicesApply_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND A.{nameof(RB_EnterpriseServicesApply_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND A.{nameof(RB_EnterpriseServicesApply_Extend.ID)}={query.ID}");
+                }
+                if (query.CompanyId > 0)
+                {
+                    builder.Append($" AND A.{nameof(RB_EnterpriseServicesApply_Extend.CompanyId)}={query.CompanyId}");
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_EnterpriseServicesApply_Extend.Name));
+                    parameters.Add("Name", "%" + query.Name.Trim() + "%");
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_EnterpriseServicesApply_Extend.CategoryId), query.CategoryId);
+                }
+
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.Append($" AND a.{nameof(RB_EnterpriseServicesApply_Extend.CreateDate)} >= '{query.StartTime}'");
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.Append($" AND a.{nameof(RB_EnterpriseServicesApply_Extend.CreateDate)} <= '{query.EndTime} 23:59:59'");
+                }
+            }
+            return Get<RB_EnterpriseServicesApply_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/TradePavilion/RB_EnterpriseServicesRepository.cs

@@ -55,5 +55,50 @@ WHERE 1=1
             builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_EnterpriseServices_Extend.ServiceId));
             return GetPage<RB_EnterpriseServices_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+
+        /// <summary>
+        /// 【商载通】获取楼宇、载体列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_EnterpriseServices_Extend> GetEnterpriseServicesListRepository(RB_EnterpriseServices_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
+FROM rb_enterpriseservices AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
+WHERE 1=1
+");
+            builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.CategoryId), query.CategoryId);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_EnterpriseServices_Extend.UserId), query.UserId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(@" AND A.{0} LIKE @Name ", nameof(RB_EnterpriseServices_Extend.Name));
+                    parameters.Add("@Name", "%" + query.Name + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_EnterpriseServices_Extend.ServiceId));
+            return Get<RB_EnterpriseServices_Extend>(builder.ToString(), parameters).ToList();
+        }
+
     }
 }