修改

2023-03-17 14:35:06 +08:00
parent b818c05525
commit c737c494a7
4 changed files with 56 additions and 7 deletions
@@ -133,12 +133,12 @@ namespace IRaCIS.Application.Services
        /// <param name="inDto"></param>
        /// <returns></returns>
        [HttpPost]
-        public async Task<(List<TrialReadQuestion>,bool)> GetTaskAdditionalQuestion(GetTaskAdditionalQuestionInDto inDto)
+        public async Task<(List<TrialAdditionaQuestion>,bool)> GetTaskAdditionalQuestion(GetTaskAdditionalQuestionInDto inDto)
        {

            var answerList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).IgnoreAutoIncludes().ToListAsync();
            var taskInfo = await _visitTaskRepository.Where(x => inDto.VisitTaskId == x.Id).FirstNotNullAsync();
-            var result= await _readingQuestionTrialRepository.Where(x => x.IsAdditional && x.ReadingQuestionCriterionTrialId == taskInfo.TrialReadingCriterionId).IgnoreAutoIncludes().IgnoreQueryFilters().ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
+            var result= await _readingQuestionTrialRepository.Where(x => x.IsAdditional && x.ReadingQuestionCriterionTrialId == taskInfo.TrialReadingCriterionId).IgnoreAutoIncludes().IgnoreQueryFilters().ProjectTo<TrialAdditionaQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();

            result.ForEach(x =>
            {
@@ -151,8 +151,16 @@ namespace IRaCIS.Application.Services
            });


+            var resultData = result.Where(x => x.Type == "group").ToList();

-            return (result,true);
+            resultData.ForEach(x =>
+            {
+                x.Childrens = result.Where(y => y.GroupId == x.Id).ToList();
+
+            });
+
+
+            return (resultData, true);
        }