Skip to content

P
performance
Commit 202c9746 by wyc
Options

读取Ecxel(FactorValue如果没值就赋null) -补充

parent 71b0221b
Showing with 12 additions and 14 deletions
performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadBillIncome.cs
......@@ -72,7 +72,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
var cellValue = ConvertHelper.ToDecimalOrNull(row.GetCell(athead.PointCell).GetValue());
if (!cellValue.HasValue || cellValue.Value == 0)
continue;
var cell = sheet.GetRow(unit.FactorRow.Value)?.GetCell(athead.PointCell);
var factorValue = sheet.GetRow(unit.FactorRow.Value)?.GetCell(athead.PointCell).GetValue();
PerData data = new PerData
{
RowNumber = r,
......@@ -84,7 +84,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
//Annotation = row.GetCell(athead.PointCell)?.CellComment?.String?.String,
UnitType = unit.UnitType, //手动匹配
//FactorValue = ConvertHelper.ToDecimalOrNull(sheet.GetRow(unit.FactorRow.Value).GetCell(athead.PointCell).GetValue()),
FactorValue = !string.IsNullOrEmpty(cell?.GetValue()) ? ConvertHelper.ToDecimalOrNull(cell?.GetValue()) : null,
FactorValue = !string.IsNullOrEmpty(factorValue) ? ConvertHelper.ToDecimalOrNull(factorValue) : null,
IsFactor = true,
};
dataList.Add(data);
......@@ -105,7 +105,6 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
var cellValue = technicianRow.GetCell(athead.PointCell).StringCellValue;
if (string.IsNullOrEmpty(cellValue))
continue;
var cell = sheet.GetRow(tunit.FactorRow.Value)?.GetCell(athead.PointCell);
PerData data = new PerData
{
RowNumber = rownum,
......@@ -116,8 +115,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
CellValue = (dataList.Select(t => (PerData)t)?.Where(t => t.TypeName == athead.CellValue).Sum(t => t.CellValue) ?? 0) / 2,
//Annotation = technicianRow.GetCell(athead.PointCell)?.CellComment?.String?.String,
UnitType = tunit.UnitType, //手动匹配
//FactorValue = ConvertHelper.ToDecimalOrNull(sheet.GetRow(tunit.FactorRow.Value).GetCell(athead.PointCell)?.ToString()),
FactorValue = !string.IsNullOrEmpty(cell?.GetValue()) ? ConvertHelper.ToDecimalOrNull(cell?.ToString()) : null,
FactorValue = ConvertHelper.ToDecimalOrNull(sheet.GetRow(tunit.FactorRow.Value).GetCell(athead.PointCell)?.ToString()),
IsFactor = true,
};
dataList.Add(data);
......
performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadExpend.cs
......@@ -74,7 +74,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
var cellValue = ConvertHelper.ToDecimalOrNull(row.GetCell(athead.PointCell).GetValue());
if (!cellValue.HasValue || cellValue.Value == 0)
continue;
var cell = sheet.GetRow(unit.FactorRow.Value)?.GetCell(athead.PointCell);
var factorValue = sheet.GetRow(unit.FactorRow.Value)?.GetCell(athead.PointCell).GetValue();
PerData data = new PerData
{
......@@ -87,7 +87,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
//Annotation = row.GetCell(athead.PointCell)?.CellComment?.String?.String,
UnitType = unit.UnitType, //手动匹配
//FactorValue = ConvertHelper.ToDecimalOrNull(sheet.GetRow(unit.FactorRow.Value).GetCell(athead.PointCell)?.NumericCellValue),
FactorValue = !string.IsNullOrEmpty(cell?.GetValue()) ? ConvertHelper.ToDecimalOrNull(cell?.NumericCellValue) : null,
FactorValue = !string.IsNullOrEmpty(factorValue) ? ConvertHelper.ToDecimalOrNull(factorValue) : null,
IsFactor = true,
};
var lastcell = vhead.OrderByDescending(t => t.PointCell).First();
......
performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadIncome.cs
......@@ -81,13 +81,13 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
CellValue = cellValue,
//Annotation = row.GetCell(athead.PointCell)?.CellComment?.String?.String,
UnitType = unit.UnitType, //手动匹配
FactorValue = ? ConvertHelper.ToDecimalOrNull(factorValue) : null,
//FactorValue = ConvertHelper.ToDecimalOrNull(sheet.GetRow(unit.FactorRow.Value).GetCell(athead.PointCell)?.NumericCellValue),
FactorValue = !string.IsNullOrEmpty(factorValue) ? ConvertHelper.ToDecimalOrNull(factorValue) : null,
IsFactor = true,
};
if (string.IsNullOrEmpty(data.AccountingUnit) && string.IsNullOrEmpty(data.Department))
continue;
dataList.Add(data);
}
}
}
......
performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadOtherIncome.cs
......@@ -71,7 +71,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
var cellValue = ConvertHelper.ToDecimalOrNull(row.GetCell(athead.PointCell).GetValue());
if (!cellValue.HasValue || cellValue.Value == 0)
continue;
var cell = sheet.GetRow(unit.FactorRow.Value).GetCell(athead.PointCell);
var factorValue = sheet.GetRow(unit.FactorRow.Value)?.GetCell(athead.PointCell).GetValue();
PerData data = new PerData
{
RowNumber = r,
......@@ -83,7 +83,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
//Annotation = row.GetCell(athead.PointCell)?.CellComment?.String?.String,
UnitType = unit.UnitType, //手动匹配
//FactorValue = ConvertHelper.ToDecimalOrNull(sheet.GetRow(unit.FactorRow.Value).GetCell(athead.PointCell)?.NumericCellValue),
FactorValue = !string.IsNullOrEmpty(cell.GetValue()) ? ConvertHelper.ToDecimalOrNull(cell.NumericCellValue) : null,
FactorValue = !string.IsNullOrEmpty(factorValue) ? ConvertHelper.ToDecimalOrNull(factorValue) : null,
IsFactor = true,
};
if (string.IsNullOrEmpty(data.AccountingUnit) && string.IsNullOrEmpty(data.Department))
......
performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadWorkload.cs
......@@ -49,7 +49,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
var cellValue = ConvertHelper.ToDecimalOrNull(row.GetCell(athead.PointCell).GetValue());
if (!cellValue.HasValue || cellValue.Value == 0)
continue;
//var cell = sheet.GetRow(unit.FactorRow.Value).GetCell(athead.PointCell);
var factorValue = sheet.GetRow(unit.FactorRow.Value)?.GetCell(athead.PointCell).GetValue();
PerData data = new PerData
{
RowNumber = r,
......@@ -60,8 +60,8 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
CellValue = cellValue,
//Annotation = row.GetCell(athead.PointCell)?.CellComment?.String?.String,
UnitType = unit.UnitType,
FactorValue = ConvertHelper.ToDecimalOrNull(sheet.GetRow(unit.FactorRow.Value).GetCell(athead.PointCell).GetValue()),
//FactorValue = !string.IsNullOrEmpty(cell.GetValue()) ? ConvertHelper.ToDecimalOrNull(cell.GetValue()) : null,
//FactorValue = ConvertHelper.ToDecimalOrNull(sheet.GetRow(unit.FactorRow.Value).GetCell(athead.PointCell).GetValue()),
FactorValue = !string.IsNullOrEmpty(factorValue) ? ConvertHelper.ToDecimalOrNull(factorValue) : null,
IsFactor = true,
};
if (sheet.SheetName.Contains("医生组"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment