Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/SchedulingController.cs

@@ -167,11 +167,11 @@ namespace Hotline.Api.Controllers
 		[HttpPut("shift")]
 		public async Task Update([FromBody] ShiftUpdateDto dto)
 		{
-			var user = await _schedulingShiftRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
-			if (user is null)
+			var shift = await _schedulingShiftRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
+			if (shift is null)
 				throw UserFriendlyException.SameMessage("无效班次信息");
-			_mapper.Map(dto, user);
-			await _schedulingShiftRepository.UpdateAsync(user, HttpContext.RequestAborted);
+			_mapper.Map(dto, shift);
+			await _schedulingShiftRepository.UpdateAsync(shift, HttpContext.RequestAborted);
 		}
 
 

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

@@ -42,12 +42,12 @@ namespace Hotline.Share.Dtos.Schedulings
 		/// <summary>
 		/// 上班时间
 		/// </summary>
-		public DateTime? WorkingTime { get; set; }
+		public TimeSpan? WorkingTime { get; set; }
 
 		/// <summary>
 		/// 下班时间
 		/// </summary>
-		public DateTime? OffDutyTime { get; set; }
+		public TimeSpan? OffDutyTime { get; set; }
 
 		/// <summary>
 		/// 排班时间
@@ -71,12 +71,12 @@ namespace Hotline.Share.Dtos.Schedulings
 		/// <summary>
 		/// 上班时间
 		/// </summary>
-		public string? WorkingTime { get; set; }
+		public TimeSpan? WorkingTime { get; set; }
 
 		/// <summary>
 		/// 下班时间
 		/// </summary>
-		public string? OffDutyTime { get; set; }
+		public TimeSpan? OffDutyTime { get; set; }
 
 		/// <summary>
 		/// 排班时间

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

@@ -17,12 +17,12 @@ namespace Hotline.Share.Dtos.Schedulings
 		/// <summary>
 		/// 上班时间
 		/// </summary>
-		public DateTime? WorkingTime { get; set; }
+		public TimeSpan? WorkingTime { get; set; }
 
 		/// <summary>
 		/// 下班时间
 		/// </summary>
-		public DateTime? OffDutyTime { get; set; }
+		public TimeSpan? OffDutyTime { get; set; }
 	}
 
 	public class ShiftAddDto
@@ -35,12 +35,12 @@ namespace Hotline.Share.Dtos.Schedulings
 		/// <summary>
 		/// 上班时间
 		/// </summary>
-		public DateTime? WorkingTime { get; set; }
+		public TimeSpan? WorkingTime { get; set; }
 
 		/// <summary>
 		/// 下班时间
 		/// </summary>
-		public DateTime? OffDutyTime { get; set; }
+		public TimeSpan? OffDutyTime { get; set; }
 	}
 	public class ShiftUpdateDto : ShiftAddDto
 	{

src/Hotline/Schedulings/Scheduling.cs

@@ -47,13 +47,13 @@ namespace Hotline.Schedulings
 		/// 上班时间
 		/// </summary>
 		[SugarColumn(ColumnDataType = "time", ColumnDescription = "上班时间")]
-		public string? WorkingTime { get; set; }
+		public TimeSpan? WorkingTime { get; set; }
 
 		/// <summary>
 		/// 下班时间
 		/// </summary>
 		[SugarColumn(ColumnDataType = "time", ColumnDescription = "下班时间")]
-		public string? OffDutyTime { get; set; }
+		public TimeSpan? OffDutyTime { get; set; }
 
 		/// <summary>
 		/// 排班时间

src/Hotline/Schedulings/SchedulingShift.cs

@@ -22,12 +22,12 @@ namespace Hotline.Schedulings
 		/// 上班时间
 		/// </summary>
 		[SugarColumn(ColumnDataType = "time", ColumnDescription = "上班时间")]
-		public string? WorkingTime { get; set; }
+		public TimeSpan? WorkingTime { get; set; }
 
 		/// <summary>
 		/// 下班时间
 		/// </summary>
 		[SugarColumn(ColumnDataType = "time", ColumnDescription = "下班时间")]
-		public string? OffDutyTime { get; set; }
+		public TimeSpan? OffDutyTime { get; set; }
 	}
 }