Compare commits
No commits in common. "4fc311d4a564b8134f1b4410d5cd99240bdc3745" and "e5d9cfc50e964f00b0781ec937bf829407e090a5" have entirely different histories.
4fc311d4a5
...
e5d9cfc50e
|
|
@ -67,8 +67,6 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
public List<TrialSiteEquipmentSurveyView> TrialSiteEquipmentSurveyList { get; set; } = new List<TrialSiteEquipmentSurveyView>();
|
public List<TrialSiteEquipmentSurveyView> TrialSiteEquipmentSurveyList { get; set; } = new List<TrialSiteEquipmentSurveyView>();
|
||||||
|
|
||||||
public List<TrialSiteUserSurveyView> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurveyView>();
|
public List<TrialSiteUserSurveyView> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurveyView>();
|
||||||
|
|
||||||
public List<SiteSurveyFiledConfig> FileConfigList { get; set; } = new List<SiteSurveyFiledConfig>();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TrialSiteUserSurveyAllDTO : TrialSiteUserSurveyView
|
public class TrialSiteUserSurveyAllDTO : TrialSiteUserSurveyView
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,6 @@ using IRaCIS.Core.Domain.Models;
|
||||||
using IRaCIS.Core.Application.ViewModel;
|
using IRaCIS.Core.Application.ViewModel;
|
||||||
using Medallion.Threading;
|
using Medallion.Threading;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using NPOI.SS.Formula.Functions;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace IRaCIS.Core.Application.Contracts
|
namespace IRaCIS.Core.Application.Contracts
|
||||||
{
|
{
|
||||||
|
|
@ -388,12 +386,10 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var result = await _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId && t.TrialId == trialId).IgnoreQueryFilters()
|
var result = await _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId && t.TrialId == trialId).IgnoreQueryFilters()
|
||||||
.ProjectTo<LoginReturnDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
|
.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;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,17 +39,6 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SiteSurveyFiledConfig
|
|
||||||
{
|
|
||||||
public string NotShowField { get; set; }
|
|
||||||
|
|
||||||
public string NeedMofifyFiled { get; set; }
|
|
||||||
|
|
||||||
public string ReplaceContent { get; set; }
|
|
||||||
|
|
||||||
public string ReplaceContentCN { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum DeclarationType
|
public enum DeclarationType
|
||||||
{
|
{
|
||||||
Other=3,
|
Other=3,
|
||||||
|
|
|
||||||
|
|
@ -182,9 +182,6 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//public List<SiteSurveyFiledConfig>
|
|
||||||
|
|
||||||
public string SiteSurveyConfigJsonStr { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
public bool VisitPlanConfirmed { get; set; }
|
public bool VisitPlanConfirmed { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue