on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Улучшения метода расширения. Добавил возможность возвращать null

Browse Source
This commit is contained in:
Степанов Дмитрий Александрович 2023-09-29 18:48:17 +05:00
parent 0b95361b69
commit ac578bce38
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs
View File

@ -185,8 +185,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory
AzimuthMagnetic = row.Cell(ColumnAzimuthMagnetic).GetCellValue<double>(), AzimuthMagnetic = row.Cell(ColumnAzimuthMagnetic).GetCellValue<double>(),
VerticalDepth = row.Cell(ColumnVerticalDepth).GetCellValue<double>(), VerticalDepth = row.Cell(ColumnVerticalDepth).GetCellValue<double>(),
Radius = row.Cell(ColumnRadius).GetCellValue<double>(), Radius = row.Cell(ColumnRadius).GetCellValue<double>(),
Comment = row.Cell(ColumnComment).IsEmpty() ? null : Comment = row.Cell(ColumnComment).GetCellValue<string?>()
row.Cell(ColumnComment).GetCellValue<string>()
}; };
return trajectoryRow; return trajectoryRow;

5
AsbCloudInfrastructure/XLExtentions.cs
View File

@ -158,10 +158,13 @@ internal static class XLExtentions
=> sheet.Range(begin.RowNumber, begin.ColumnNumber, end.RowNumber, end.ColumnNumber); => sheet.Range(begin.RowNumber, begin.ColumnNumber, end.RowNumber, end.ColumnNumber);
internal static T GetCellValue<T>(this IXLCell cell) internal static T? GetCellValue<T>(this IXLCell cell)
{ {
try try
{ {
if (cell.IsEmpty() && default(T) == null)
return default;
if (typeof(T) != typeof(DateTime)) if (typeof(T) != typeof(DateTime))
return (T)Convert.ChangeType(cell.GetFormattedString(), typeof(T), CultureInfo.InvariantCulture); return (T)Convert.ChangeType(cell.GetFormattedString(), typeof(T), CultureInfo.InvariantCulture);