页面修改

Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs

@@ -8,8 +8,25 @@ namespace Mall.Model.Extend.TradePavilion
     /// <summary>
     /// 商会活动表扩展实体类
     /// </summary>
-    public class RB_Commerce_Activity_Extend: RB_Commerce_Activity
+    public class RB_Commerce_Activity_Extend : RB_Commerce_Activity
     {
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActivityTypeName { get; set; }
+
+        /// <summary>
+        /// 开始时间字符串
+        /// </summary>
+        public string StartTimeStr { get { return Common.ConvertHelper.FormatDate(this.StartTime); } }
+
+
+        /// <summary>
+        /// 结束时间字符串
+        /// </summary>
+        public string EndTimeStr { get { return Common.ConvertHelper.FormatDate(this.EndTime); } }
+
+
         /// <summary>
         /// 商会活动详情列表
         /// </summary>

Mall.Module.TradePavilion/CommerceActivityModule.cs

@@ -58,7 +58,7 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Commerce_Activity_Extend.EndTime),model.EndTime },
                     {nameof(RB_Commerce_Activity_Extend.CoverImg),model.CoverImg },
                     {nameof(RB_Commerce_Activity_Extend.ActivityType),model.ActivityType },
-                    {nameof(RB_Commerce_Activity_Extend.ActivityInfo),model.ActivityType },
+                    {nameof(RB_Commerce_Activity_Extend.ActivityInfo),model.ActivityInfo },
                     {nameof(RB_Commerce_Activity_Extend.UpdateBy),model.UpdateBy },
                     {nameof(RB_Commerce_Activity_Extend.UpdateDate),model.UpdateDate },
                 };
@@ -161,6 +161,16 @@ namespace Mall.Module.TradePavilion
             return activityTypeRepository.GetCommerceActivityTypePageListRepository(pageIndex, pageSize, out rowsCount, query);
         }
 
+        /// <summary>
+        /// 获取商会活动类型列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_ActivityType_Extend> GetCommerceActivityTypeListModule(RB_Commerce_ActivityType_Extend query)
+        {
+            return activityTypeRepository.GetCommerceActivityTypeListRepository(query);
+        }
+
         /// <summary>
         /// 新增修改商会活动类型
         /// </summary>

Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs

@@ -28,11 +28,11 @@ namespace Mall.Repository.TradePavilion
             DynamicParameters parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT * 
-FROM RB_Commerce_Activity
+SELECT A.*,IFNULL(B.TypeName,'') AS ActivityTypeName
+FROM rb_commerce_activity AS A LEFT JOIN rb_commerce_activitytype AS B ON A.ActivityType=B.Id
 WHERE 1=1
 ");
-            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Activity_Extend.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.Status), (int)DateStateEnum.Normal);
             if (query == null)
             {
                 return new List<RB_Commerce_Activity_Extend>();
@@ -41,15 +41,15 @@ WHERE 1=1
             {
                 if (query.TenantId > 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Activity_Extend.TenantId), query.TenantId);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.TenantId), query.TenantId);
                 }
                 if (query.MallBaseId > 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_Activity_Extend.MallBaseId), query.MallBaseId);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Activity_Extend.MallBaseId), query.MallBaseId);
                 }
                 if (!string.IsNullOrEmpty(query.ActivityName))
                 {
-                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_Activity_Extend.ActivityName));
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Commerce_Activity_Extend.ActivityName));
                     parameters.Add("Name", "%" + query.ActivityName.Trim() + "%");
                 }
             }

Mall.Repository/TradePavilion/RB_Commerce_ActivityTypeRepository.cs

@@ -55,5 +55,43 @@ WHERE 1=1
             }
             return GetPage<RB_Commerce_ActivityType_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 获取商会活动类型列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Commerce_ActivityType_Extend> GetCommerceActivityTypeListRepository(RB_Commerce_ActivityType_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Commerce_ActivityType
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_ActivityType_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Commerce_ActivityType_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_ActivityType_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Commerce_ActivityType_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.TypeName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_ActivityType_Extend.TypeName));
+                    parameters.Add("Name", "%" + query.TypeName.Trim() + "%");
+                }
+            }
+            return Get<RB_Commerce_ActivityType_Extend>(builder.ToString(), parameters).ToList();
+        }
     }
 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -416,6 +416,24 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
+        /// <summary>
+        /// 获取商会活动类型列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetCommerceActivityTypeList()
+        {
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Commerce_ActivityType_Extend()
+            {
+                TypeName = jObj.GetStringValue("TypeName")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = activityModule.GetCommerceActivityTypeListModule(query);
+            
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 新增修改商会活动类型
         /// </summary>