提交代码

Mall.Repository/Education/RB_Education_ActivityRepository.cs

@@ -85,6 +85,92 @@ WHERE 1=1
             return GetPage<RB_Education_Activity_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_Education_Activity_Extend> GetCommerceActivityPageListRepository_V2(int pageIndex, int pageSize, out long rowsCount, RB_Education_Activity_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.TypeName,'') AS ActivityTypeName,IFNULL(C.JoinNum,0) AS JoinNum
+FROM RB_Education_Activity AS A LEFT JOIN RB_Education_Activitytype AS B ON A.ActivityType=B.Id
+     LEFT JOIN (SELECT ActivityId,COUNT(1) AS JoinNum  FROM rb_education_consult WHERE `Status`=0 and OrderStatus=1 GROUP BY ActivityId) AS C ON A.Id=C.ActivityId
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Education_Activity_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.MallBaseId), query.MallBaseId);
+                }
+
+                if (!string.IsNullOrEmpty(query.ActivityName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Education_Activity_Extend.ActivityName));
+                    parameters.Add("Name", "%" + query.ActivityName.Trim() + "%");
+                }
+                if (query.ActivityType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.ActivityType), query.ActivityType);
+                }
+
+                if (query.SelectIsEnd == 0)//未开始
+                {
+                    builder.AppendFormat($" and  DATE_FORMAT(a.{ nameof(RB_Education_Activity_Extend.StartTime)},'%Y-%m-%d' ) > DATE_FORMAT(NOW(),'%Y-%m-%d' ) ");
+                }
+                else if (query.SelectIsEnd == 1)//已结束
+                {
+                    builder.AppendFormat($" and  DATE_FORMAT(a.{nameof(RB_Education_Activity_Extend.EndTime)},'%Y-%m-%d' )< DATE_FORMAT(NOW(),'%Y-%m-%d' ) ");
+                }
+                else if (query.SelectIsEnd == 2)//进行中
+                {
+                    builder.AppendFormat($" and  DATE_FORMAT(a.{ nameof(RB_Education_Activity_Extend.StartTime)},'%Y-%m-%d' ) <=DATE_FORMAT(NOW(),'%Y-%m-%d' ) ");
+                    builder.AppendFormat($" and  DATE_FORMAT(a.{ nameof(RB_Education_Activity_Extend.EndTime)},'%Y-%m-%d' ) >=DATE_FORMAT(NOW(),'%Y-%m-%d' ) ");
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.SelectStartTimeStr))
+                {
+                    builder.AppendFormat($" and  DATE_FORMAT(a.{ nameof(RB_Education_Activity_Extend.StartTime)},'%Y-%m-%d' )>=DATE_FORMAT('{query.SelectStartTimeStr}','%Y-%m-%d' ) ");
+                }
+                if (!string.IsNullOrWhiteSpace(query.SelectEndTimeStr))
+                {
+                    builder.AppendFormat($" and  DATE_FORMAT(a.{nameof(RB_Education_Activity_Extend.StartTime)},'%Y-%m-%d' )<= DATE_FORMAT('{query.SelectEndTimeStr}','%Y-%m-%d' ) ");
+                }
+                if (!string.IsNullOrWhiteSpace(query.OrderByStr))
+                {
+                    builder.AppendFormat($" ORDER BY A.{query.OrderByStr}  asc");
+                }
+                else
+                {
+                    builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Education_Activity_Extend.Id));
+                }
+            }
+            return GetPage<RB_Education_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+
         /// <summary>
         /// 获取当前用户参加商会活动分页列表
         /// </summary>

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -2035,12 +2035,13 @@ namespace Mall.WebApi.Controllers.Education
             var query = new RB_Education_Activity_Extend()
             {
                 ActivityName = jObj.GetStringValue("ActivityName"),
-                SelectStartTimeStr= jObj.GetStringValue("SelectStartTimeStr"),
+                SelectStartTimeStr = jObj.GetStringValue("SelectStartTimeStr"),
                 SelectEndTimeStr = jObj.GetStringValue("SelectEndTimeStr"),
+                SelectIsEnd = jObj.GetInt("SelectIsEnd", -1),
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = activityModule.GetActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, isQuerySignup: true);
+            var list = activityModule.GetActivityPageListModule_V2(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, isQuerySignup: true);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
             return ApiResult.Success(data: pageModel);
@@ -2080,7 +2081,14 @@ namespace Mall.WebApi.Controllers.Education
                 LocationName = jObj.GetStringValue("LocationName"),
                 LnsideLimit = jObj.GetInt("LnsideLimit", 0),
             };
-
+            //try
+            //{
+            //    extModel.ActivityTitleList = JsonConvert.DeserializeObject<List<RB_Education_ActivityTitle_Extend>>(jObj.GetStringValue("ActivityTitle"));
+            //}
+            //catch (Exception ex)
+            //{
+            //    extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
+            //}
             extModel.Status = Common.Enum.DateStateEnum.Normal;
             extModel.MallBaseId = RequestParm.MallBaseId;
             extModel.TenantId = RequestParm.TenantId;
@@ -2126,6 +2134,26 @@ namespace Mall.WebApi.Controllers.Education
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var Id = parms.GetInt("Id", 0);
             var extModel = activityModule.GetActivityModule(Id);
+
+            //if (extModel != null && extModel.Id > 0)
+            //{
+            //    extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
+            //    extModel.ActivityTitleList = activityModule.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
+            //    if (extModel.ActivityTitleList != null && extModel.ActivityTitleList.Any())
+            //    {
+            //        var planList = activityModule.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
+            //        if (planList != null && planList.Any())
+            //        {
+            //            planList.ForEach(x => x.TripPicList = !string.IsNullOrWhiteSpace(x.TripPic) ? JsonConvert.DeserializeObject<List<string>>(x.TripPic) : new List<string>());
+            //            foreach (var item in extModel.ActivityTitleList)
+            //            {
+            //                item.ActivityPlanList = new List<RB_Education_ActivityPlan_Extend>();
+            //                item.ActivityPlanList = planList.Where(x => x.TitleId == item.Id).ToList();
+            //            }
+            //        }
+
+            //    }
+            //}
             return ApiResult.Success(data: extModel);
         }
 
@@ -2197,7 +2225,7 @@ namespace Mall.WebApi.Controllers.Education
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
             query.OrderStatus = 1;
-           // query.EnrollState = 3;
+            // query.EnrollState = 3;
             var list = activityModule.GetCommerceConsultListRepository_V2(query);
 
             var result = list.Select(x => new