页面修改

Mall.Module.TradePavilion/CommerceActivityModule.cs

@@ -184,15 +184,28 @@ namespace Mall.Module.TradePavilion
             return flag;
         }
 
-
         /// <summary>
         /// 获取列表
         /// </summary>
         /// <param name="dmodel"></param>
+        /// <param name="isGetSignUp">是否获取报名数据</param>
         /// <returns></returns>
-        public List<RB_Commerce_Activity_Extend> GetCommerceActivityListModule(RB_Commerce_Activity_Extend query)
+        public List<RB_Commerce_Activity_Extend> GetCommerceActivityListModule(RB_Commerce_Activity_Extend query, bool isGetSignUp = false)
         {
-            return commerce_ActivityRepository.GetCommerceActivityListRepository(query);
+            var list = commerce_ActivityRepository.GetCommerceActivityListRepository(query);
+            if (isGetSignUp && list != null && list.Count > 0)
+            {
+                string Ids = string.Join(",", list.Select(qitem => qitem.Id));
+                var persionList = commerce_ConsultRepository.GetCommerceConsultListRepository(new RB_Commerce_Consult_Extend()
+                {
+                    ActivityIds = Ids
+                });
+                foreach (var item in list)
+                {
+                    item.CommerceConsultList = persionList?.Where(qitem => qitem.ActivityId == item.Id)?.ToList() ?? new List<RB_Commerce_Consult_Extend>();
+                }
+            }
+            return list;
         }
 
         #endregion

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -2000,7 +2000,7 @@ namespace Mall.WebApi.Controllers
                     {
                         TenantId = TenantId,
                         ActivityIds = tradeActivityData.ActivityIds
-                    });
+                    },isGetSignUp:true);
                     List<object> activityDataList = new List<object>();
                     if (activityList != null && activityList.Count > 0)
                     {
@@ -2015,10 +2015,11 @@ namespace Mall.WebApi.Controllers
                                 aItem.CoverImg,
                                 aItem.ActivityType,
                                 aItem.ActivityTypeName,
-                                SignStartTime=Common.ConvertHelper.FormatTime( aItem.SignStartTime),
+                                SignStartTime = Common.ConvertHelper.FormatTime(aItem.SignStartTime),
                                 SignEndTime = Common.ConvertHelper.FormatTime(aItem.SignEndTime),
-                                IsDefault=aItem.Id.ToString().Equals(tradeActivityData.DefaultActivityId),
-                                IsCheck= aItem.Id.ToString().Equals(tradeActivityData.DefaultActivityId),
+                                IsDefault = aItem.Id.ToString().Equals(tradeActivityData.DefaultActivityId),
+                                IsCheck = aItem.Id.ToString().Equals(tradeActivityData.DefaultActivityId),
+                                IsSign = aItem.CommerceConsultList != null && aItem.CommerceConsultList.Count > 0,
                             };
                             activityDataList.Add(aObj);
                         }