计算天数按照30.44算,增加控制字段
continuous-integration/drone/push Build is passing

This commit is contained in:
2026-01-05 14:27:23 +08:00
parent 834f6be548
commit 8803a5f5b2
7 changed files with 21425 additions and 3 deletions
@@ -121,7 +121,7 @@ namespace IRaCIS.Core.Application.ViewModel
{
if (DaysDiff.HasValue)
{
return Math.Round(DaysDiff.Value / 30.0, 1, MidpointRounding.AwayFromZero);
return Math.Round(DaysDiff.Value / 30.44, 2, MidpointRounding.AwayFromZero);
}
return null;
}
@@ -281,6 +281,8 @@ namespace IRaCIS.Application.Contracts
public bool IsIQCAutoNextTask { get; set; }
public bool IsExternalViewTrialChart { get; set; }
#endregion
}
@@ -1546,14 +1546,14 @@ namespace IRaCIS.Core.Application
[AllowAnonymous]
public async Task<TrialConfigInfo> GetTrialExtralConfig(Guid trialId)
{
var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask }).FirstOrDefault();
var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr,t.IsExternalViewTrialChart, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask }).FirstOrDefault();
var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
var trialConfig = _mapper.Map<TrialConfigInfo>(extralConfig);
trialConfig.TrialObjectNameList = extralObj.TrialObjectNameList;
trialConfig.IsExternalViewTrialChart = extralObj.IsExternalViewTrialChart;
trialConfig.CollectImagesEnum = extralObj.CollectImagesEnum;
trialConfig.IsIQCAutoNextTask = extralObj.IsIQCAutoNextTask;