Commit bb2ae29f by lcx

获取configid方法修改

parent 826fb36a
...@@ -836,6 +836,9 @@ ...@@ -836,6 +836,9 @@
<member name="F:Performance.DtoModels.SheetType.Assess"> <member name="F:Performance.DtoModels.SheetType.Assess">
<summary> 考核 </summary> <summary> 考核 </summary>
</member> </member>
<member name="F:Performance.DtoModels.SheetType.Custom">
<summary> 自定义抽取模板 </summary>
</member>
<member name="T:Performance.DtoModels.AccountUnitType"> <member name="T:Performance.DtoModels.AccountUnitType">
<summary> <summary>
核算单元类型 核算单元类型
......
...@@ -35,7 +35,7 @@ CustomExtractService customExtractService ...@@ -35,7 +35,7 @@ CustomExtractService customExtractService
public PerSheetPoint Point => new PerSheetPoint public PerSheetPoint Point => new PerSheetPoint
{ {
DataFirstRowNum = 2, DataFirstRowNum = 2,
DataFirstCellNum = 7, DataFirstCellNum = 6,
}; };
public void WriteDataToCustom(IWorkbook workbook, per_allot allot, ExcelStyle style) public void WriteDataToCustom(IWorkbook workbook, per_allot allot, ExcelStyle style)
...@@ -64,7 +64,7 @@ public void WriteDataToCustom(IWorkbook workbook, per_allot allot, ExcelStyle st ...@@ -64,7 +64,7 @@ public void WriteDataToCustom(IWorkbook workbook, per_allot allot, ExcelStyle st
var exscript = exscripts.FirstOrDefault(t => t.TypeId == module.TypeId); var exscript = exscripts.FirstOrDefault(t => t.TypeId == module.TypeId);
if (exscript == null) continue; if (exscript == null) continue;
var conf = configs.FirstOrDefault(w => w.Id == module.ConfigId); var conf = configs.FirstOrDefault(w => w.Id == (module.ConfigId ?? exscript.ConfigId));
if (conf == null) continue; if (conf == null) continue;
var execsql = exscript.ExecScript; var execsql = exscript.ExecScript;
......
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