质检

src/Hotline.Api/Controllers/QualityController.cs

@@ -172,6 +172,7 @@ namespace Hotline.Api.Controllers
 			if (item is null)
 				throw UserFriendlyException.SameMessage("无效质检项目");
 			_mapper.Map(dto, item);
+			item.LastModificationName = _sessionContext.UserName;
 			await _qualiteyItem.UpdateAsync(item, HttpContext.RequestAborted);
 		}
 
@@ -187,6 +188,7 @@ namespace Hotline.Api.Controllers
 			var (total, items) = await _qualiteyItem.Queryable()
 				.WhereIF(!string.IsNullOrEmpty(dto.Name), d => d.Name.Contains(dto.Name!))
 				.WhereIF(!string.IsNullOrEmpty(dto.GroupingName), d => d.GroupingName.Contains(dto.GroupingName!))
+				.WhereIF(dto.IsEnable.HasValue,d=>d.IsEnable == dto.IsEnable)
 				.OrderByDescending(x => x.CreationTime)
 				.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 			return new PagedDto<QualityItemDto>(total, _mapper.Map<IReadOnlyList<QualityItemDto>>(items));
@@ -274,8 +276,8 @@ namespace Hotline.Api.Controllers
 			if (template is null)
 				throw UserFriendlyException.SameMessage("无效质检模版");
 			_mapper.Map(dto, template);
+			template.LastModificationName = _sessionContext.UserName;
 			await _qualityTemplate.UpdateAsync(template, HttpContext.RequestAborted);
-
 			List<QualityTemplateDetail> details = await _qualiteyTemplateDetail.Queryable().Where(x => x.TemplateId == dto.Id).ToListAsync();
 			await _qualiteyTemplateDetail.RemoveRangeAsync(details, HttpContext.RequestAborted);
 			foreach (var item in dto.TemplateDetails)
@@ -299,6 +301,7 @@ namespace Hotline.Api.Controllers
 				.Includes(x => x.QualityTemplates)
 				.WhereIF(!string.IsNullOrEmpty(dto.Name), d => d.Name.Contains(dto.Name!))
 				.WhereIF(dto.Grouping.HasValue, d => d.Grouping == dto.Grouping)
+				.WhereIF(dto.IsEnable.HasValue, d => d.IsEnable == dto.IsEnable)
 				.OrderByDescending(x => x.CreationTime)
 				.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 			return new PagedDto<QualityTemplateDto>(total, _mapper.Map<IReadOnlyList<QualityTemplateDto>>(items));
@@ -382,11 +385,12 @@ namespace Hotline.Api.Controllers
 		[HttpPut("prohibited")]
 		public async Task Update([FromBody] ProhibitedUpdateDto dto)
 		{
-			var template = await _qualiteyProhibited.GetAsync(dto.Id, HttpContext.RequestAborted);
-			if (template is null)
+			var prohibited = await _qualiteyProhibited.GetAsync(dto.Id, HttpContext.RequestAborted);
+			if (prohibited is null)
 				throw UserFriendlyException.SameMessage("无效质检模版");
-			_mapper.Map(dto, template);
-			await _qualiteyProhibited.UpdateAsync(template, HttpContext.RequestAborted);
+			_mapper.Map(dto, prohibited);
+			prohibited.LastModificationName = _sessionContext.UserName;
+			await _qualiteyProhibited.UpdateAsync(prohibited, HttpContext.RequestAborted);
 		}
 
 		/// <summary>

src/Hotline.Share/Dtos/Quality/QualityItemDto.cs

@@ -49,7 +49,7 @@ namespace Hotline.Share.Dtos.Quality
 	{
 		public List<string> Ids { get; set; }
 	}
-	public class QualityItemUpdateDto: QualityItemAddDto
+	public class QualityItemUpdateDto : QualityItemAddDto
 	{
 		public string Id { get; set; }
 	}
@@ -59,10 +59,16 @@ namespace Hotline.Share.Dtos.Quality
 		/// 质检项目名称
 		/// </summary>
 		public string? Name { get; set; }
+
 		/// <summary>
 		/// 质检项目分组名称
 		/// </summary>
 		public string? GroupingName { get; set; }
+
+		/// <summary>
+		/// 启禁用
+		/// </summary>
+		public int? IsEnable { get; set; }
 	}
 	public class QualityItemBaseDto
 	{
@@ -131,6 +137,10 @@ namespace Hotline.Share.Dtos.Quality
 		/// </summary>
 		public int IsEnable { get; set; }
 
-		
+		/// <summary>
+		/// 最近更新人
+		/// </summary>
+		public string? LastModificationName { get; set; }
+
 	}
 }

src/Hotline.Share/Dtos/Quality/QualityProhibitedDto.cs

@@ -117,5 +117,10 @@ namespace Hotline.Share.Dtos.Quality
 		/// </summary>
 		public string? Synonym { get; set; }
 
+		/// <summary>
+		/// 最近更新人
+		/// </summary>
+		public string? LastModificationName { get; set; }
+
 	}
 }

src/Hotline.Share/Dtos/Quality/QualityTemplateDto.cs

@@ -35,7 +35,7 @@ namespace Hotline.Share.Dtos.Quality
 		/// </summary>
 		public List<TemplateDetailAddDto> TemplateDetails { get; set; }
 	}
-	public class TemplateDeleteDto 
+	public class TemplateDeleteDto
 	{
 		public string Id { get; set; }
 	}
@@ -43,7 +43,7 @@ namespace Hotline.Share.Dtos.Quality
 	{
 		public List<string> Ids { get; set; }
 	}
-	public class TemplateUpdateDto: TemplateAddDto
+	public class TemplateUpdateDto : TemplateAddDto
 	{
 		public string Id { get; set; }
 	}
@@ -57,6 +57,11 @@ namespace Hotline.Share.Dtos.Quality
 		/// 质检项目分组
 		/// </summary>
 		public ETemplateGrouping? Grouping { get; set; }
+
+		/// <summary>
+		/// 启禁用
+		/// </summary>
+		public int? IsEnable { get; set; }
 	}
 	public class TemplateBaseDto
 	{
@@ -121,6 +126,11 @@ namespace Hotline.Share.Dtos.Quality
 
 		public string GroupingText => Grouping.GetDescription();
 
+		/// <summary>
+		/// 最近更新人
+		/// </summary>
+		public string? LastModificationName { get; set; }
+
 	}
 
 	public class TemplateDetailAddDto
@@ -151,7 +161,7 @@ namespace Hotline.Share.Dtos.Quality
 		public int IsIntelligent { get; set; }
 
 	}
-	public class TemplateDetailDto: TemplateBaseDto
+	public class TemplateDetailDto : TemplateBaseDto
 	{
 		/// <summary>
 		/// 质检模版ID

src/Hotline/Quality/QualityItem.cs

@@ -44,5 +44,12 @@ namespace Hotline.Quality
 		[SugarColumn(ColumnDescription = "启禁用  0  启用  1 禁用")]
 		public int IsEnable { get; set; }
 
+
+		/// <summary>
+		/// 最近更新人
+		/// </summary>
+		[SugarColumn(ColumnDescription = "最近更新人")]
+		public string? LastModificationName { get; set; }
+
 	}
 }

src/Hotline/Quality/QualityProhibited.cs

@@ -35,5 +35,11 @@ namespace Hotline.Quality
 		/// </summary>
 		[SugarColumn(ColumnDescription = "违禁近义词", ColumnDataType = "varchar(2000)")]
 		public string? Synonym { get; set; }
+
+		/// <summary>
+		/// 最近更新人
+		/// </summary>
+		[SugarColumn(ColumnDescription = "最近更新人")]
+		public string? LastModificationName { get; set; }
 	}
 }

src/Hotline/Quality/QualityTemplate.cs

@@ -42,5 +42,11 @@ namespace Hotline.Quality
 		/// </summary>
 		[Navigate(NavigateType.OneToMany, nameof(QualityTemplateDetail.TemplateId))]
 		public List<QualityTemplateDetail> QualityTemplates { get; set; }
+
+		/// <summary>
+		/// 最近更新人
+		/// </summary>
+		[SugarColumn(ColumnDescription = "最近更新人")]
+		public string? LastModificationName { get; set; }
 	}
 }