This commit is contained in:
he
2023-05-16 10:03:12 +08:00
parent 40599918ba
commit 1bb95bd1b5
5 changed files with 117 additions and 19 deletions
@@ -1319,7 +1319,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var value = await GetSODData(inDto);
if (value == null || inDto.IsBaseLine)
if (value == null || inDto.IsBaseLine || !inDto.IsConvertedTask||inDto.BeforeConvertedTaskId!=null)
{
return null;
}
@@ -1336,6 +1336,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
/// <returns></returns>
public async Task<decimal?> GetiSODData(ReadingCalculateDto inDto)
{
if (!inDto.IsConvertedTask || inDto.BeforeConvertedTaskId != null)
{
return null;
}
if (iSODData != null)
{
return iSODData.Value;
@@ -1389,7 +1394,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var value = await GetiSODData(inDto);
if (value == null || inDto.IsBaseLine)
if (value == null || inDto.IsBaseLine || !inDto.IsConvertedTask || inDto.BeforeConvertedTaskId != null)
{
return null;
}