Skip to content

P
performance
Commit 35503514 by lcx
Options

其他工作量抽取修改

parent d2946dd0
Showing with 12 additions and 6 deletions
performance/Performance.Services/DFExtractService.cs
...@@ -520,10 +520,14 @@ public string AlllotExecute(string email, sys_hospital hospital, List<sys_hospit ...@@ -520,10 +520,14 @@ public string AlllotExecute(string email, sys_hospital hospital, List<sys_hospit
WriteExpend(sheet, sheetRead, modules, items, extracts, false); WriteExpend(sheet, sheetRead, modules, items, extracts, false);
break; break;
case SheetType.Workload: case SheetType.Workload:
case SheetType.OtherWorkload:
ClearData(sheet, 3, 3); ClearData(sheet, 3, 3);
WriteWorkload(sheet, sheetRead, modules, items, extracts, false); WriteWorkload(sheet, sheetRead, modules, items, extracts, false);
break; break;
case SheetType.OtherWorkload:
ClearData(sheet, 1, 3, true);
sheetRead = PerSheetDataFactory.GetDataRead(SheetType.Workload);
WriteWorkload(sheet, sheetRead, modules, items, extracts);
break;
//case SheetType.AccountBasic: //case SheetType.AccountBasic:
// WriteAccountBasic(sheet, sheetRead, false); // WriteAccountBasic(sheet, sheetRead, false);
// break; // break;
...@@ -838,9 +842,9 @@ private void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook workbook ...@@ -838,9 +842,9 @@ private void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook workbook
if (sheet == null) if (sheet == null)
{ {
logger.LogInformation($"CreateNotExistSheet: {module.ModuleName}"); logger.LogInformation($"CreateNotExistSheet: {module.ModuleName}");
string key = "工作量"; //string key = "工作量";
if (module.ModuleName.Contains(key)) //if (module.ModuleName.Contains(key))
{ //{
var item = pairs.Where(t => t.Key.StartsWith("3.")).OrderByDescending(t => t.Key).First(); var item = pairs.Where(t => t.Key.StartsWith("3.")).OrderByDescending(t => t.Key).First();
if (sheetIndex == 0) if (sheetIndex == 0)
sheetIndex = item.Value + newSheetCount + 1; sheetIndex = item.Value + newSheetCount + 1;
...@@ -850,7 +854,7 @@ private void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook workbook ...@@ -850,7 +854,7 @@ private void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook workbook
workbook.SetSheetOrder(newSheet.SheetName, workbook.NumberOfSheets - 1); workbook.SetSheetOrder(newSheet.SheetName, workbook.NumberOfSheets - 1);
workbook.SetSheetName(workbook.NumberOfSheets - 1, module.ModuleName); workbook.SetSheetName(workbook.NumberOfSheets - 1, module.ModuleName);
sheetIndex++; sheetIndex++;
} //}
} }
} }
} }
......
performance/Performance.Services/PerExcelService/PerSheetService.cs
...@@ -90,8 +90,10 @@ public SheetType GetSheetType(string sheetName) ...@@ -90,8 +90,10 @@ public SheetType GetSheetType(string sheetName)
return SheetType.Income; return SheetType.Income;
else if (sheetName.StartsWith("2.")) else if (sheetName.StartsWith("2."))
return SheetType.Expend; return SheetType.Expend;
else if (sheetName.StartsWith("3.")) else if (sheetName.StartsWith("3.1") || sheetName.StartsWith("3.2"))
return SheetType.Workload; return SheetType.Workload;
else if (sheetName.StartsWith("3."))
return SheetType.OtherWorkload;
else if (sheetName.StartsWith("4.1")) else if (sheetName.StartsWith("4.1"))
return SheetType.AccountBasic; return SheetType.AccountBasic;
else if (sheetName.StartsWith("4.2")) else if (sheetName.StartsWith("4.2"))
......
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