SU2-33 | Парсер формы 1.3, фикс смещения колонок в упрощённой отчётности

app/services/report_parsers/form11_parser.rb

@@ -19,10 +19,11 @@ module ReportParsers
       columns = detect_columns(sheet, header_row)
 
 
-      value_headers = columns[:value_columns].each_with_object({}) do |col, hash|
-        header_text = read_cell(sheet, header_row, col).to_s
+      # year читается по оригинальному col заголовка, данные — по откалиброванному
+      value_headers = columns[:value_columns].zip(columns[:data_value_columns]).each_with_object({}) do |(header_col, data_col), hash|
+        header_text = read_cell(sheet, header_row, header_col).to_s
         year = extract_year_from_header(header_text)
-        hash[col] = year
+        hash[data_col] = year
       end
 
       all_rows = (header_row + 1).upto(sheet.last_row).filter_map do |row|
@@ -30,7 +31,7 @@ module ReportParsers
         line_code = read_cell(sheet, row, columns[:code_column]).to_s.strip.presence
         next if ignored_row?(line_name, line_code)
 
-        values = columns[:value_columns].each_with_object({}) do |col, hash|
+        values = columns[:data_value_columns].each_with_object({}) do |col, hash|
           value = read_cell(sheet, row, col)
           year = value_headers[col]
           hash[year.to_s] = value if value.present? && year.present?
@@ -46,7 +47,7 @@ module ReportParsers
       end
 
       payloads_by_year = {}
-      value_headers.each do |col, year|
+      value_headers.each do |_data_col, year|
         next unless year.present?
 
         rows_for_year = all_rows.map do |row|
@@ -114,13 +115,29 @@ module ReportParsers
         value_columns = columns.keys.select { |col| col > code_column && columns[col].present? }
       end
 
+      original_cols = value_columns.sort.first(3)
       {
         name_column: name_column,
         code_column: code_column,
-        value_columns: value_columns.sort.first(3)
+        value_columns: original_cols,
+        data_value_columns: calibrate_value_columns(sheet, header_row, original_cols, code_column)
       }
     end
 
+    def calibrate_value_columns(sheet, header_row, value_columns, code_column)
+      data_row = (header_row + 2).upto(sheet.last_row).find do |row|
+        sheet.cell(row, code_column).to_s.strip.match?(/\A\d{4}\z/)
+      end
+      return value_columns unless data_row
+
+      value_columns.map do |col|
+        next col unless sheet.cell(data_row, col).nil? || sheet.cell(data_row, col).to_s.strip.empty?
+
+        shifted = col + 1
+        shifted <= sheet.last_column && !sheet.cell(data_row, shifted).to_s.strip.empty? ? shifted : col
+      end
+    end
+
     def extract_year(sheet)
       period_text = sheet.cell(4, 1).to_s
       year = period_text[/\d{4}/].to_i