修改一版

2022-08-12 13:43:09 +08:00
parent bfb905d130
commit b937ddbe51
6 changed files with 45 additions and 11 deletions
@@ -26,9 +26,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public Guid? RelevanceId { get; set; }
 		public string RelevanceValue { get; set; }
 		public int ShowQuestion { get; set; }
-		public int MaxRowCount { get; set; }
+		public int? MaxRowCount { get; set; }
 		public string DataTableName { get; set; }
 		public string DataTableColumn { get; set; }
+
+		/// <summary>
+		/// 表格问题类型
+		/// </summary>
+		public TableQuestionType TableQuestionType { get; set; }
 	}

 	
@@ -38,6 +43,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto

 		public Guid ReadingQuestionId { get; set; }

+		/// <summary>
+		/// 表格问题类型
+		/// </summary>
+		public TableQuestionType? TableQuestionType { get; set; }
+
 	}

 	///<summary> ReadingTableQuestionSystemAddOrEdit  列表查询参数模型</summary>
@@ -59,9 +69,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public Guid? RelevanceId { get; set; }
 		public string RelevanceValue { get; set; }
 		public int ShowQuestion { get; set; }
-		public int MaxRowCount { get; set; }
+		public int? MaxRowCount { get; set; }
 		public string DataTableName { get; set; }
 		public string DataTableColumn { get; set; }
+
+		/// <summary>
+		/// 表格问题类型
+		/// </summary>
+		public TableQuestionType TableQuestionType { get; set; }
 	}

 	public class ReadingCriterionPageView
@@ -377,7 +392,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; }
+		public int? MaxQuestionCount { get; set; }
 	}

 	public class ReadingQuestionSystemView
@@ -476,7 +491,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; }
+		public int? MaxQuestionCount { get; set; }
 	}


@@ -753,7 +768,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; } = 0;
+		public int? MaxQuestionCount { get; set; }
 	}


@@ -862,7 +877,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 最大问题数
 		/// </summary>
-		public int MaxQuestionCount { get; set; } = 0;
+		public int? MaxQuestionCount { get; set; }
 	}


@@ -80,6 +80,7 @@ namespace IRaCIS.Application.Services


            var readingTableQuestionSystemQueryable = _readingTableQuestionSystemRepository
+            .WhereIf(inDto.TableQuestionType!=null,x=>x.TableQuestionType ==inDto.TableQuestionType!)
            .Where(x=>x.ReadingQuestionId==inDto.ReadingQuestionId).ProjectTo<ReadingTableQuestionSystemView>(_mapper.ConfigurationProvider);

            var result=await readingTableQuestionSystemQueryable.ToListAsync();