1

Mall.Module.Education/ActivityModule.cs

@@ -2608,7 +2608,13 @@ namespace Mall.Module.Education
         {
             var list = education_ActivityRepository.GetList(query);
             list = list.Where(x => !string.IsNullOrEmpty(x.CoverImg)).ToList();//排除没有封面图的
-
+            //查询活动类型
+            string typeIds = string.Join(",", list.Select(x => x.ActivityType).Distinct());
+            var typeList = education_ActivityTypeRepository.GetActivityTypeListRepository(new RB_Education_ActivityType_Extend() { MallBaseId = query.MallBaseId, Ids = typeIds });
+            list.ForEach(x =>
+            {
+                x.ActivityTypeName = typeList.Where(y => y.Id == x.ActivityType).FirstOrDefault()?.TypeName ?? "";
+            });
             //根据查询日期 开始遍历
             DateTime STime = Convert.ToDateTime(query.SelectStartTimeStr);
             DateTime ETime = Convert.ToDateTime(query.SelectEndTimeStr);
@@ -2618,10 +2624,12 @@ namespace Mall.Module.Education
                 RList.Add(new
                 {
                     Date = STime.ToString("yyyy-MM-dd"),
-                    ActivityList = alist.Select(x => new
+                    ActivityList = alist.OrderBy(x => x.StartTime).Select(x => new
                     {
                         x.Id,
                         x.ActivityName,
+                        x.ActivityType,
+                        x.ActivityTypeName,
                         StartTime = x.StartTime.ToString("MM-dd HH:mm"),
                         EndTime = x.EndTime.ToString("MM-dd HH:mm"),
                         x.CoverImg,