diff --git a/20220313_Excel/TempTask.WebEntry/ApiController/Dto/DtoInput.cs b/20220313_Excel/TempTask.WebEntry/ApiController/Dto/DtoInput.cs index 075fb1f..b7a747e 100644 --- a/20220313_Excel/TempTask.WebEntry/ApiController/Dto/DtoInput.cs +++ b/20220313_Excel/TempTask.WebEntry/ApiController/Dto/DtoInput.cs @@ -78,6 +78,11 @@ namespace TempTask.WebEntry.ApiController.Dto /// 跳过行 集合 行留空 /// public List skip_rows { get; set; } + /// + /// 跳过行 集合 行留空 + /// + public List skip_columns { get; set; } + } /// /// diff --git a/20220313_Excel/TempTask.WebEntry/Tools/NumZjHelper.cs b/20220313_Excel/TempTask.WebEntry/Tools/NumZjHelper.cs index 963f331..fa0562d 100644 --- a/20220313_Excel/TempTask.WebEntry/Tools/NumZjHelper.cs +++ b/20220313_Excel/TempTask.WebEntry/Tools/NumZjHelper.cs @@ -85,7 +85,6 @@ namespace TempTask.WebEntry.Tools int current_skip_count = 0; for (int i = 0; i < sheet_item.null_row_count; i++) { - var c_rowindex = startRowIndex + i; if (sheet_item.skip_rows != null && sheet_item.skip_rows.Contains(c_rowindex + 1)) { @@ -101,10 +100,13 @@ namespace TempTask.WebEntry.Tools } else { - var column_letter = App.Configuration[$"column_name_match_{excelTypeInt}_{sheet_item.sheet_no}:{ x.ToExcelColumnName()}"]; - if (string.IsNullOrWhiteSpace(column_letter)) + var column_letter = x.ToExcelColumnName(); + if (sheet_item.skip_columns != null && sheet_item.skip_columns.Contains(column_letter)) continue; - var jtoken = datas[i - current_skip_count][column_letter]; + var api_column_name = App.Configuration[$"column_name_match_{excelTypeInt}_{sheet_item.sheet_no}:{ x.ToExcelColumnName()}"]; + if (string.IsNullOrWhiteSpace(api_column_name)) + continue; + var jtoken = datas[i - current_skip_count][api_column_name]; var cellvalue = string.Empty; if (jtoken.Type == JTokenType.Null) cellvalue = "/"; diff --git a/20220313_Excel/TempTask.WebEntry/urlconfig.json b/20220313_Excel/TempTask.WebEntry/urlconfig.json index 510d9f5..e99939d 100644 --- a/20220313_Excel/TempTask.WebEntry/urlconfig.json +++ b/20220313_Excel/TempTask.WebEntry/urlconfig.json @@ -18,7 +18,8 @@ "start_cell": "B", "null_cell_count": 27, "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/totalKeyRate?months={year}{_month}&week={week2}", - "skip_rows": [ 10, 12 ] + "skip_rows": [ 10, 12 ], + }, { "sheet_no": 2, @@ -51,7 +52,8 @@ "null_row_count": 14, "start_cell": "B", "null_cell_count": 27, - "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=104,105,106,107,108,109&months={year}{_month}&week={week2}" + "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=104,105,106,107,108,109&months={year}{_month}&week={week2}", + //"skip_columns": [ "J", "S" ] }, { "sheet_no": 3, @@ -93,7 +95,8 @@ "null_row_count": 13, "start_cell": "B", "null_cell_count": 24, - "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=101,102,103&months={year}{_month}&week={week2}" + "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=101,102,103&months={year}{_month}&week={week2}", + //"skip_columns": [ "P", "S" ] }, { "sheet_no": 3, diff --git a/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(城市更新)样表.xlsx b/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(城市更新)样表.xlsx index 3c9998b..53d2f79 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 16f5e11..56a9638 100644 Binary files a/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(房地产业+GDP支撑性指标)样表.xlsx and b/20220313_Excel/TempTask.WebEntry/wwwroot/ExcelTemplate/住建系统抓投资情况通报(房地产业+GDP支撑性指标)样表.xlsx differ