Merge branch 'master' of http://140.143.162.39:3000/wxd/WebPeis0523

src/Shentun.WebPeis.Application/AppointScheduleTimes/AppointScheduleTimeAppService.cs

@@ -68,19 +68,26 @@ namespace Shentun.WebPeis.AppointScheduleTimes
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("api/app/AppointScheduleTime/UpdateAppointScheduleTimeNumberLimit")]
-        public async Task UpdateAppointScheduleTimeNumberLimitAsync(UpdateAppointScheduleTimeNumberLimitInputDto input)
+        public async Task UpdateAppointScheduleTimeNumberLimitAsync(List<UpdateAppointScheduleTimeNumberLimitInputDto> input)
         {
-            var appointScheduleTimeEnt = await _appointScheduleTimeRepository.FirstOrDefaultAsync(f => f.AppointScheduleTimeId == input.AppointScheduleTimeId);
+            if (input.Any())
+            {
+                foreach (var item in input)
+                {
+                    var appointScheduleTimeEnt = await _appointScheduleTimeRepository.FirstOrDefaultAsync(f => f.AppointScheduleTimeId == item.AppointScheduleTimeId);
 
-            if (appointScheduleTimeEnt == null)
-                throw new UserFriendlyException("预约计划明细ID不正确");
+                    if (appointScheduleTimeEnt == null)
+                        throw new UserFriendlyException("预约计划明细ID不正确");
 
-            if (appointScheduleTimeEnt.AppointNumber > input.NumberLimit)
-                throw new UserFriendlyException("人数限制不能小于当前已预约数量");
+                    if (appointScheduleTimeEnt.AppointNumber > item.NumberLimit)
+                        throw new UserFriendlyException("人数限制不能小于当前已预约数量");
 
-            appointScheduleTimeEnt.NumberLimit = input.NumberLimit;
+                    appointScheduleTimeEnt.NumberLimit = item.NumberLimit;
 
-            await _appointScheduleTimeRepository.UpdateAsync(appointScheduleTimeEnt);
+                    await _appointScheduleTimeRepository.UpdateAsync(appointScheduleTimeEnt);
+                }
+             
+            }
         }
     }
 }

src/Shentun.WebPeis.Application/AppointSchedules/AppointScheduleAppService.cs

@@ -280,7 +280,7 @@ namespace Shentun.WebPeis.AppointSchedules
                     entList = entList.Where(m => m.AppointDate.Date >= DateTime.Parse(input.StartDate));
                 }
             }
-            var entListDto = entList.Select(s => new AppointScheduleDto
+            var entListDto = entList.ToList().Select(s => new AppointScheduleDto
             {
                 AppointDate = DataHelper.ConversionDateShortToString(s.AppointDate),
                 AppointScheduleId = s.AppointScheduleId,