田爽 1 年之前
父節點
當前提交
9068999e33
共有 2 個文件被更改,包括 12 次插入13 次删除
  1. 3 2
      src/Hotline.Api/Controllers/QualityController.cs
  2. 9 11
      src/Hotline.Share/Dtos/Quality/QualityTemplateDto.cs

+ 3 - 2
src/Hotline.Api/Controllers/QualityController.cs

@@ -336,12 +336,13 @@ namespace Hotline.Api.Controllers
 		/// <param name="id"></param>
 		/// <returns></returns>
 		[HttpGet("template/{id}")]
-		public async Task<QualityTemplate> TemplateEntity(string id)
+		public async Task<QualityTemplateDto> TemplateEntity(string id)
 		{
-			return await _qualityTemplate.Queryable()
+			var template = await _qualityTemplate.Queryable()
 				.Includes(x => x.templateDetails)
 				.Includes(x => x.templateDetails, y => y.QualityItem)
 				.FirstAsync(x => x.Id == id);
+			return _mapper.Map<QualityTemplateDto>(template);
 		}
 		/// <summary>
 		/// 启禁用

+ 9 - 11
src/Hotline.Share/Dtos/Quality/QualityTemplateDto.cs

@@ -154,29 +154,27 @@ namespace Hotline.Share.Dtos.Quality
 		public string TemplateId { get; set; }
 
 		/// <summary>
-		/// 质检项目名称
-		/// </summary>
-		public string Name { get; set; }
-
-		/// <summary>
-		/// 扣分内容
+		/// 质检项ID
 		/// </summary>
-		public string? Content { get; set; }
+		public string ItemId { get; set; }
 
 		/// <summary>
-		/// 扣分时间点- 秒
+		/// 质检项目名称
 		/// </summary>
-		public int Second { get; set; }
+		public string Name => QualityItem.Name;
 
 		/// <summary>
 		/// 分值
 		/// </summary>
-		public int Grade { get; set; }
+		public int Grade => QualityItem.Grade;
 
 		/// <summary>
 		/// 是否智能质检项目
 		/// </summary>
-		public int IsIntelligent { get; set; }
+		public int IsIntelligent => QualityItem.IsIntelligent;
+
+
+		public QualityItemDto QualityItem { get; set; } = new QualityItemDto();
 
 		/// <summary>
 		///