ewide/number_zj
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://118.178.224.202:3000/ewide/number_zj

Browse Source
This commit is contained in:
H3ZV9FTKT90KGE2\Administrator
2022-03-14 02:34:55 +08:00
parent e9f0754b8f fd46d710fe
commit af52e069fe
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
20220313_Excel/TempTask.WebEntry/Tools/NumZjHelper.cs
View File

@@ -84,8 +84,7 @@ namespace TempTask.WebEntry.Tools
int current_skip_count = 0; int current_skip_count = 0;
for (int i = 0; i < sheet_item.null_row_count; i++) 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; var c_rowindex = startRowIndex + i;
if (sheet_item.skip_rows != null && sheet_item.skip_rows.Contains(c_rowindex + 1)) 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(); 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++) 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 (i >= datas.Count + (sheet_item.skip_rows?.Count ?? 0))
if (string.IsNullOrWhiteSpace(column_letter)) {
continue; sheet.GetRow(c_rowindex).GetCell(x).SetCellValue("/");
var jtoken = datas[i - current_skip_count][column_letter]; }
var cellvalue = string.Empty;
if (jtoken.Type == JTokenType.Null)
cellvalue = "/";
else 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; //var x = 0;
//foreach (var cell in cells) //foreach (var cell in cells)

BIN
20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报（城市更新）样表.xlsx
View File

Binary file not shown.

BIN
20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报（房地产业+GDP支撑性指标）样表.xlsx
View File

Binary file not shown.

BIN
20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/总表（样表）.xls
View File

Binary file not shown.