Skip to content

P
performance
Commit 293739f3 by lcx
Options

Merge branch 'feature/抽取优化' into develop

parents 1c94729e 298eea8e
Showing with 242 additions and 25 deletions
performance/Performance.Api/appsettings.Localhost.json
......@@ -8,7 +8,7 @@
},
"AppConnection": {
//"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
"PerformanceConnectionString": "server=192.168.18.166;database=db_test_liutie;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
"PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
"HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
"RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
},
......
performance/Performance.Services/ExtractExcelService/ExtractDtos/IncomeRow.cs 0 → 100644
namespace Performance.Services.ExtractExcelService
{
public class IncomeRow
{
public string Department { get; set; }
public string DoctorAccount { get; set; }
public string NurseAccount { get; set; }
public string TechnicAccounting { get; set; }
public int RowNumber { get; set; }
public IncomeRow(string department, string doctorAccount, string nurseAccount, string technicAccounting, int rowNumber)
{
Department = department;
DoctorAccount = doctorAccount;
NurseAccount = nurseAccount;
TechnicAccounting = technicAccounting;
RowNumber = rowNumber;
}
}
}
performance/Performance.Services/ExtractExcelService/ExtractHelper/WriteDataHelper.cs
......@@ -93,7 +93,17 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
var columnHeader = sheet.GetOrCreate(point.HeaderFirstRowNum.Value);
int dataFirstRowNum = point.DataFirstRowNum.Value;
WriteSheetDataExistent(sheet, columnHeader, point, sheetType, style, headers, data, ref dataFirstRowNum);
List<IncomeRow> rows = new List<IncomeRow>();
WriteSheetDataExistent(sheet, columnHeader, point, sheetType, style, headers, data, rows, ref dataFirstRowNum);
if (sheetType == SheetType.Income && rows != null)
{
dataFirstRowNum = point.DataFirstRowNum.Value;
RemoveIncomeRow(sheet, point);
WriteSheetIncomeData(sheet, columnHeader, point, style, headers, data, rows, dataFirstRowNum);
dataFirstRowNum = point.DataFirstRowNum.Value + rows.Count;
}
if (data == null || !data.Any(t => !string.IsNullOrEmpty(t.Department))) return;
......@@ -101,7 +111,7 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
}
private static void WriteSheetDataExistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
List<string> headers, List<ExtractTransDto> data, ref int dataFirstRowNum)
List<string> headers, List<ExtractTransDto> data, List<IncomeRow> incomes, ref int dataFirstRowNum)
{
if (sheet.LastRowNum <= dataFirstRowNum) return;
......@@ -116,28 +126,31 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
var row = sheet.GetRow(rowIndex);
if (row == null) continue;
if (rowIndex > dataFirstRowNum) dataFirstRowNum = rowIndex + 1;
string department = row.GetOrCreate(dataFirstCellNum - 1).GetDecodeEscapes();
if (string.IsNullOrEmpty(department)) continue;
if (rowIndex > dataFirstRowNum) dataFirstRowNum = rowIndex;
var deptData = data.Where(t => t.Department == department);
if (deptData == null || !deptData.Any()) continue;
#region 写入数据
if (sheetType == SheetType.Income)
{
incomes.Add(GetIncomeRowMessage(row, dataFirstCellNum, department, rowIndex));
continue;
}
for (int cellIndex = dataFirstCellNum; cellIndex < columnHeader.LastCellNum; cellIndex++)
{
var column = columnHeader.GetOrCreate(cellIndex).GetDecodeEscapes();
var cell = row.GetOrCreate(cellIndex);
var value = deptData.FirstOrDefault(t => t.Category.NoBlank() == column)?.Value;
//数据为空，且单元格值不为空，不写入数据（保留原始值）
var notWrite = !value.HasValue && !string.IsNullOrEmpty(cell.ToString());
if (sheetType == SheetType.Income)
{
cell.SetCellValue<decimal>(value);
cell.CellStyle = cellStyle;
}
else if (cell.CellType != CellType.Formula && !notWrite)
if (cell.CellType != CellType.Formula && !notWrite)
{
cell.SetCellValue<decimal>(value);
if (headers != null && headers.Contains(column))
......@@ -147,9 +160,12 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
}
}
#endregion
data.RemoveAll(t => t.Department == department);
}
dataFirstRowNum += 1;
if (point.DataFirstRowNum.Value < dataFirstRowNum) dataFirstRowNum += 1;
}
private static void WriteSheetDataNonexistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
......@@ -195,6 +211,56 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
}
}
private static void WriteSheetIncomeData(ISheet sheet, IRow columnHeader, PerSheetPoint point, ExcelStyle style, List<string> headers,
List<ExtractTransDto> data, List<IncomeRow> incomes, int dataFirstRowNum)
{
var cellStyle = style.SetBgkColorAndFormat(style.GetCellStyle(), StyleType.数据);
var deptStyle = style.GetCellStyle();
headers = headers.Select(t => t.NoBlank()).ToList();
int dataFirstCellNum = point.DataFirstCellNum.Value;
foreach (var item in incomes)
{
var row = sheet.GetOrCreate(dataFirstRowNum);
var deptData = data.Where(t => t.Department == item.Department);
if (deptData == null || !deptData.Any()) continue;
var deptContents = new Dictionary<int, string>
{
{ 1, item.Department },
{ 2, item.NurseAccount },
{ 3, item.DoctorAccount },
{ 4, item.TechnicAccounting },
};
foreach (var content in deptContents)
{
var cell = row.GetOrCreate(dataFirstCellNum - content.Key);
cell.SetCellValue(content.Value);
cell.CellStyle = deptStyle;
}
for (int cellIndex = dataFirstCellNum; cellIndex < columnHeader.LastCellNum; cellIndex++)
{
var column = columnHeader.GetOrCreate(cellIndex).GetDecodeEscapes();
var cell = row.GetOrCreate(cellIndex);
var value = deptData.FirstOrDefault(t => t.Category.NoBlank() == column)?.Value;
if (cell.CellType != CellType.Formula)
{
cell.SetCellValue<decimal>(value);
cell.CellStyle = cellStyle;
}
}
dataFirstRowNum++;
data.RemoveAll(t => t.Department == item.Department);
}
}
public static string HasValue(params string[] list)
{
if (list == null || !list.Any()) return null;
......@@ -249,7 +315,17 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
var columnHeader = sheet.GetOrCreate(point.HeaderFirstRowNum.Value);
int dataFirstRowNum = point.DataFirstRowNum.Value;
WriteCollectDataExistent(sheet, columnHeader, point, sheetType, style, headers, data, ref dataFirstRowNum);
List<IncomeRow> rows = new List<IncomeRow>();
WriteCollectDataExistent(sheet, columnHeader, point, sheetType, style, headers, data, rows, ref dataFirstRowNum);
if (sheetType == SheetType.Income && rows != null)
{
dataFirstRowNum = point.DataFirstRowNum.Value;
RemoveIncomeRow(sheet, point);
WriteCollectIncomeData(sheet, columnHeader, point, style, headers, data, rows, dataFirstRowNum);
dataFirstRowNum = point.DataFirstRowNum.Value + rows.Count;
}
if (data == null || !data.Any(t => !string.IsNullOrEmpty(t.Department))) return;
......@@ -257,7 +333,7 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
}
private static void WriteCollectDataExistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
List<string> headers, List<collect_data> data, ref int dataFirstRowNum)
List<string> headers, List<collect_data> data, List<IncomeRow> incomes, ref int dataFirstRowNum)
{
if (sheet.LastRowNum <= dataFirstRowNum) return;
......@@ -272,27 +348,31 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
var row = sheet.GetRow(rowIndex);
if (row == null) continue;
if (rowIndex > dataFirstRowNum) dataFirstRowNum = rowIndex + 1;
string department = row.GetOrCreate(dataFirstCellNum - 1).GetDecodeEscapes();
if (string.IsNullOrEmpty(department)) continue;
if (rowIndex > dataFirstRowNum) dataFirstRowNum = rowIndex;
var deptData = data.Where(t => t.Department == department);
if (deptData == null || !deptData.Any()) continue;
#region 写入数据
if (sheetType == SheetType.Income)
{
incomes.Add(GetIncomeRowMessage(row, dataFirstCellNum, department, rowIndex));
continue;
}
for (int cellIndex = dataFirstCellNum; cellIndex < columnHeader.LastCellNum; cellIndex++)
{
var column = columnHeader.GetOrCreate(cellIndex).GetDecodeEscapes();
var cell = row.GetOrCreate(cellIndex);
var value = deptData.FirstOrDefault(t => t.TypeName.NoBlank() == column)?.CellValue;
if (sheetType == SheetType.Income)
{
cell.SetCellValue<decimal>(value);
cell.CellStyle = cellStyle;
}
else if (cell.CellType != CellType.Formula)
//数据为空，且单元格值不为空，不写入数据（保留原始值）
var notWrite = string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(cell.ToString());
if (cell.CellType != CellType.Formula && !notWrite)
{
cell.SetCellValue<decimal>(value);
if (headers != null && headers.Contains(column))
......@@ -302,9 +382,12 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
}
}
#endregion
data.RemoveAll(t => t.Department == department);
}
dataFirstRowNum += 1;
if (point.DataFirstRowNum.Value < dataFirstRowNum) dataFirstRowNum += 1;
}
private static void WriteCollectDataNonexistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
......@@ -348,6 +431,56 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
}
}
private static void WriteCollectIncomeData(ISheet sheet, IRow columnHeader, PerSheetPoint point, ExcelStyle style, List<string> headers,
List<collect_data> data, List<IncomeRow> incomes, int dataFirstRowNum)
{
var cellStyle = style.SetBgkColorAndFormat(style.GetCellStyle(), StyleType.数据);
var deptStyle = style.GetCellStyle();
headers = headers.Select(t => t.NoBlank()).ToList();
int dataFirstCellNum = point.DataFirstCellNum.Value;
foreach (var item in incomes)
{
var row = sheet.GetOrCreate(dataFirstRowNum);
var deptData = data.Where(t => t.Department == item.Department);
if (deptData == null || !deptData.Any()) continue;
var deptContents = new Dictionary<int, string>
{
{ 1, item.Department },
{ 2, item.NurseAccount },
{ 3, item.DoctorAccount },
{ 4, item.TechnicAccounting },
};
foreach (var content in deptContents)
{
var cell = row.GetOrCreate(dataFirstCellNum - content.Key);
cell.SetCellValue(content.Value);
cell.CellStyle = deptStyle;
}
for (int cellIndex = dataFirstCellNum; cellIndex < columnHeader.LastCellNum; cellIndex++)
{
var column = columnHeader.GetOrCreate(cellIndex).GetDecodeEscapes();
var cell = row.GetOrCreate(cellIndex);
var value = deptData.FirstOrDefault(t => t.TypeName.NoBlank() == column)?.CellValue;
if (cell.CellType != CellType.Formula)
{
cell.SetCellValue<decimal>(value);
cell.CellStyle = cellStyle;
}
}
dataFirstRowNum++;
data.RemoveAll(t => t.Department == item.Department);
}
}
/// <summary> 收入固定列 </summary>
private static readonly Dictionary<string, Func<collect_data, string>> collectIncome = new Dictionary<string, Func<collect_data, string>>
{
......@@ -372,5 +505,65 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
};
#endregion CollectData
/// <summary>
/// 抽取优化，获取有数据的科室信息
/// </summary>
/// <param name="row"></param>
/// <param name="dataFirstCellNum"></param>
/// <param name="department"></param>
/// <param name="rowIndex"></param>
/// <returns></returns>
private static IncomeRow GetIncomeRowMessage(IRow row, int dataFirstCellNum, string department, int rowIndex)
{
var nurse = row.GetOrCreate(dataFirstCellNum - 2).GetDecodeEscapes();
var doctor = row.GetOrCreate(dataFirstCellNum - 3).GetDecodeEscapes();
var technic = row.GetOrCreate(dataFirstCellNum - 4).GetDecodeEscapes();
for (int j = dataFirstCellNum - 4; j < dataFirstCellNum; j++)
{
var cell = row.GetCell(j);
if (cell != null)
{
cell.RemoveCellComment();
row.RemoveCell(cell);
}
}
return new IncomeRow(department, doctor, nurse, technic, rowIndex);
}
/// <summary>
/// 抽取优化，删除收入数据的核算科室信息
/// </summary>
/// <param name="row"></param>
/// <param name="dataFirstCellNum"></param>
/// <param name="department"></param>
/// <param name="rowIndex"></param>
/// <returns></returns>
private static void RemoveIncomeRow(ISheet sheet, PerSheetPoint point)
{
if (sheet == null)
return;
for (int i = point.DataFirstRowNum.Value; i < sheet.LastRowNum + 1; i++)
{
var row = sheet.GetRow(i);
if (row != null)
{
int dataFirstCellNum = point.DataFirstCellNum.Value;
//跳过核算单元和科室
for (int j = dataFirstCellNum - 4; j < dataFirstCellNum; j++)
{
var cell = row.GetCell(j);
if (cell != null)
{
cell.RemoveCellComment();
row.RemoveCell(cell);
}
}
}
}
}
}
}
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