diff --git a/20220313_Excel/TempTask.WebEntry/Tools/NumZjHelper.cs b/20220313_Excel/TempTask.WebEntry/Tools/NumZjHelper.cs index 7e4a8c5..87a8280 100644 --- a/20220313_Excel/TempTask.WebEntry/Tools/NumZjHelper.cs +++ b/20220313_Excel/TempTask.WebEntry/Tools/NumZjHelper.cs @@ -84,8 +84,7 @@ namespace TempTask.WebEntry.Tools int current_skip_count = 0; for (int i = 0; i < sheet_item.null_row_count; i++) { - if (i >= datas.Count + (sheet_item.skip_rows?.Count ?? 0)) - break; + var c_rowindex = startRowIndex + i; if (sheet_item.skip_rows != null && sheet_item.skip_rows.Contains(c_rowindex + 1)) { @@ -95,16 +94,23 @@ namespace TempTask.WebEntry.Tools int cell_start_index = sheet_item.start_cell.ToExcelColumnIndex(); for (int x = cell_start_index; x < cell_start_index + sheet_item.null_cell_count; x++) { - var column_letter = App.Configuration[$"column_name_match_{excelTypeInt}_{sheet_item.sheet_no}:{ x.ToExcelColumnName()}"]; - if (string.IsNullOrWhiteSpace(column_letter)) - continue; - var jtoken = datas[i - current_skip_count][column_letter]; - var cellvalue = string.Empty; - if (jtoken.Type == JTokenType.Null) - cellvalue = "/"; + if (i >= datas.Count + (sheet_item.skip_rows?.Count ?? 0)) + { + sheet.GetRow(c_rowindex).GetCell(x).SetCellValue("/"); + } else - cellvalue = jtoken.ToString(); - sheet.GetRow(c_rowindex).GetCell(x).SetCellValue(cellvalue); + { + var column_letter = App.Configuration[$"column_name_match_{excelTypeInt}_{sheet_item.sheet_no}:{ x.ToExcelColumnName()}"]; + if (string.IsNullOrWhiteSpace(column_letter)) + continue; + var jtoken = datas[i - current_skip_count][column_letter]; + var cellvalue = string.Empty; + if (jtoken.Type == JTokenType.Null) + cellvalue = "/"; + else + cellvalue = jtoken.ToString(); + sheet.GetRow(c_rowindex).GetCell(x).SetCellValue(cellvalue); + } } //var x = 0; //foreach (var cell in cells) diff --git a/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(城市更新)样表.xlsx b/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(城市更新)样表.xlsx index 86d9f34..e104b89 100644 Binary files a/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(城市更新)样表.xlsx and b/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(城市更新)样表.xlsx differ diff --git a/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(房地产业+GDP支撑性指标)样表.xlsx b/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(房地产业+GDP支撑性指标)样表.xlsx index f2366cc..a5165d6 100644 Binary files a/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(房地产业+GDP支撑性指标)样表.xlsx and b/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(房地产业+GDP支撑性指标)样表.xlsx differ diff --git a/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/总表(样表).xls b/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/总表(样表).xls index 64099a8..f6fdcab 100644 Binary files a/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/总表(样表).xls and b/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/总表(样表).xls differ