site 调研增加配置字段

2024-06-13 17:42:04 +08:00
parent c004741f95
commit 2b424ff45c
4 changed files with 22 additions and 2 deletions
@@ -67,6 +67,8 @@ namespace IRaCIS.Core.Application.Contracts
        public List<TrialSiteEquipmentSurveyView> TrialSiteEquipmentSurveyList { get; set; } = new List<TrialSiteEquipmentSurveyView>();

        public List<TrialSiteUserSurveyView> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurveyView>();
+
+        public List<SiteSurveyFiledConfig> FileConfigList { get; set; } = new List<SiteSurveyFiledConfig>();
    }

    public class TrialSiteUserSurveyAllDTO : TrialSiteUserSurveyView
@@ -22,6 +22,8 @@ using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Application.ViewModel;
 using Medallion.Threading;
 using Microsoft.Extensions.Options;
+using NPOI.SS.Formula.Functions;
+using Newtonsoft.Json;

 namespace IRaCIS.Core.Application.Contracts
 {
@@ -386,10 +388,12 @@ namespace IRaCIS.Core.Application.Contracts
            }


-
-
            var result = await _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId && t.TrialId == trialId).IgnoreQueryFilters()
                .ProjectTo<LoginReturnDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
+
+            var siteSurveryConfig= _trialSiteSurveyRepository.Where(t=>t.Id == trialSiteSurveyId).Select(t=>t.Trial.SiteSurveyConfigJsonStr).FirstOrDefault();
+
+            result.FileConfigList= JsonConvert.DeserializeObject<List<SiteSurveyFiledConfig>>(siteSurveryConfig) ?? new List<SiteSurveyFiledConfig>();
            return result;
        }