排班

src/Hotline.Api/Controllers/SchedulingController.cs

@@ -38,7 +38,7 @@ namespace Hotline.Api.Controllers
 		/// <param name="dtos"></param>
 		/// <returns></returns>
 		[HttpPost("user")]
-		public async Task Add([FromBody] List<SchedulingUserDto> dtos)
+		public async Task Add([FromBody] List<UserAddDto> dtos)
 		{
 			List<SchedulingUser> user = new List<SchedulingUser>();
 			foreach (var dto in dtos)
@@ -139,7 +139,7 @@ namespace Hotline.Api.Controllers
 		/// <param name="dtos"></param>
 		/// <returns></returns>
 		[HttpPost("shift")]
-		public async Task Add([FromBody] SchedulingShiftDto dto)
+		public async Task Add([FromBody] ShiftAddDto dto)
 		{
 			var model = _mapper.Map<SchedulingShift>(dto);
 			await _schedulingShiftRepository.AddAsync(model, HttpContext.RequestAborted);
@@ -210,18 +210,27 @@ namespace Hotline.Api.Controllers
 		/// <param name="dtos"></param>
 		/// <returns></returns>
 		[HttpPost]
-		public async Task Add([FromBody] List<SchedulingDto> dtos)
+		public async Task Add([FromBody] AddDto dtos)
 		{
 			List<Scheduling> schedulings = new List<Scheduling>();
-			foreach (var dto in dtos)
+			foreach (var dto in dtos.UserDtos)
 			{
-				if (string.IsNullOrEmpty(dto.SchedulingUserId))
+				if (string.IsNullOrEmpty(dto.UserId))
 					throw UserFriendlyException.SameMessage("请传入排班用户信息");
-				if (string.IsNullOrEmpty(dto.ShiftId))
+				if (string.IsNullOrEmpty(dtos.ShiftId))
 					throw UserFriendlyException.SameMessage("请传入排班班次信息");
 
-				var scheduling = _mapper.Map<Scheduling>(dto);
-				scheduling.SendOrderNum = 0;
+				var scheduling = new Scheduling
+				{
+					SchedulingUserId = dto.UserId,
+					SchedulingUserName = dto.UserName,
+					ShiftId = dtos.ShiftId,
+					ShiftName = dtos.ShiftName,
+					SchedulingTime = dtos.SchedulingTime,
+					WorkingTime = dtos.WorkingTime,
+					OffDutyTime = dtos.OffDutyTime,
+					SendOrderNum = 0
+				};
 				schedulings.Add(scheduling);
 			}
 			await _schedulingRepository.AddRangeAsync(schedulings, HttpContext.RequestAborted);

src/Hotline.Share/Dtos/Schedulings/SchedulingDto.cs

@@ -56,7 +56,7 @@ namespace Hotline.Share.Dtos.Schedulings
 	}
 	public class AddDto
 	{
-		List<SchedulingUserDto> UserDtos { get; set; }
+		public List<SchedulingUserDto> UserDtos { get; set; }
 
 		/// <summary>
 		/// 班次名称
@@ -68,6 +68,16 @@ namespace Hotline.Share.Dtos.Schedulings
 		/// </summary>
 		public string? ShiftName { get; set; }
 
+		/// <summary>
+		/// 上班时间
+		/// </summary>
+		public DateTime? WorkingTime { get; set; }
+
+		/// <summary>
+		/// 下班时间
+		/// </summary>
+		public DateTime? OffDutyTime { get; set; }
+
 		/// <summary>
 		/// 排班时间
 		/// </summary>