diff --git a/api/src/repository/vsp_repository.py b/api/src/repository/vsp_repository.py index 4858f04..87c0de5 100644 --- a/api/src/repository/vsp_repository.py +++ b/api/src/repository/vsp_repository.py @@ -14,6 +14,17 @@ class VSPRepository: def __init__(self, db: AsyncSession): self.db = db + async def get_reg_numbers_by_ids(self, vsp_ids: list[int]) -> dict[int, str]: + """Номера ВСП по id, включая закрытые (is_active=False), для подписи в экспорте.""" + if not vsp_ids: + return {} + rows = ( + await self.db.execute( + select(Vsp.id, Vsp.reg_number).where(Vsp.id.in_(vsp_ids), Vsp.is_deleted.is_(False)) + ) + ).all() + return {row.id: row.reg_number for row in rows} + async def get( self, vsp_id: int, diff --git a/api/src/services/export_service/export_mappings.py b/api/src/services/export_service/export_mappings.py index 2398a18..adeaa37 100644 --- a/api/src/services/export_service/export_mappings.py +++ b/api/src/services/export_service/export_mappings.py @@ -4008,3 +4008,1340 @@ def render_column_years(columns: dict, year: int) -> dict: _replace_column_year_placeholders(rendered, values) return rendered + + +# FORM_2 (Операц/АХР/КВ Сметы РФ): дерево колонок и цвета для выгрузки Excel, сгенерированы +# из web/src/components/RealtimeTable/constants/FORM_2/{OPER,AHR,CAP}.js (колонки у всех трёх +# листов идентичны, различаются только цвета). header.vsp_address («Адрес ВСП») исключён — +# его нет в исходной форме РФ (AURORA-1902). ВСП в выгрузке подставляется номером +# (registration_number), а не id — см. ExportService._resolve_form2_vsp_numbers. +FORM2_DEPTH_COLUMNS: dict = { + "section_code": { + "name": "Код раздела", + "key": "header.section_code", + }, + "item_id": { + "name": "ID Статьи", + "key": "header.item_id", + }, + "num_group": { + "name": "ID Группы номенклатуры", + "key": "header.num_group", + }, + "name": { + "name": "Наименование", + "key": "header.name", + }, + "vsp_id": { + "name": "ВСП РФ", + "key": "header.vsp_id", + }, + "god": { + "name": "{year} год", + "key": None, + "children": { + "planirovanie_godovykh_pokazateley": { + "name": "Планирование годовых показателей", + "key": None, + "children": { + "q1": { + "name": "1 квартал", + "key": "plan.q1", + }, + "q2": { + "name": "2 квартал", + "key": "plan.q2", + }, + "q3": { + "name": "3 квартал", + "key": "plan.q3", + }, + "q4": { + "name": "4 квартал", + "key": "plan.q4", + }, + "year": { + "name": "Год", + "key": "plan.year", + }, + "comment": { + "name": "Комментарий", + "key": "plan.comment", + }, + }, + }, + "sekvestirovanie_dfip": { + "name": "Секвестирование ДФиП", + "key": None, + "children": { + "q1": { + "name": "1 квартал", + "key": "seq_dfip.q1", + }, + "q2": { + "name": "2 квартал", + "key": "seq_dfip.q2", + }, + "q3": { + "name": "3 квартал", + "key": "seq_dfip.q3", + }, + "q4": { + "name": "4 квартал", + "key": "seq_dfip.q4", + }, + "year": { + "name": "Год", + "key": "seq_dfip.year", + }, + "justification": { + "name": "Обоснование", + "key": "seq_dfip.justification", + }, + }, + }, + "sekvestirovanie_ssp_go": { + "name": "Секвестирование ССП ГО", + "key": None, + "children": { + "q1": { + "name": "1 квартал", + "key": "seq_ssp.q1", + }, + "q2": { + "name": "2 квартал", + "key": "seq_ssp.q2", + }, + "q3": { + "name": "3 квартал", + "key": "seq_ssp.q3", + }, + "q4": { + "name": "4 квартал", + "key": "seq_ssp.q4", + }, + "year": { + "name": "Год", + "key": "seq_ssp.year", + }, + "justification": { + "name": "Обоснование", + "key": "seq_ssp.justification", + }, + }, + }, + "utverzhdennaya_smeta_raskhodov": { + "name": "Утвержденная смета расходов", + "key": None, + "children": { + "q1": { + "name": "1 квартал", + "key": "approved.q1", + }, + "q2": { + "name": "2 квартал", + "key": "approved.q2", + }, + "q3": { + "name": "3 квартал", + "key": "approved.q3", + }, + "q4": { + "name": "4 квартал", + "key": "approved.q4", + }, + "year": { + "name": "Год", + "key": "approved.year", + }, + }, + }, + "parametry_zaklyuchennogo_khozyaystvennogo_dogovora": { + "name": "Параметры заключенного хозяйственного договора", + "key": None, + "children": { + "counterparty": { + "name": "Контрагент", + "key": "contract.counterparty", + }, + "reference": { + "name": "Номер", + "key": "contract.reference", + }, + "date": { + "name": "Дата", + "key": "contract.date", + }, + "subject": { + "name": "Предмет", + "key": "contract.subject", + }, + "currency": { + "name": "Валюта", + "key": "contract.currency", + }, + "ceiling": { + "name": "Предельная стоимость", + "key": "contract.ceiling", + }, + "vat_rate": { + "name": "Ставка НДС (%)", + "key": "contract.vat_rate", + }, + "deadline": { + "name": "Срок", + "key": "contract.deadline", + }, + "scheme": { + "name": "Схема платежа", + "key": "contract.scheme", + }, + "act": { + "name": "АКТ", + "key": "contract.act", + }, + "comment": { + "name": "Комментарий", + "key": "contract.comment", + }, + "q1": { + "name": "Бронь средств в 1 квартале", + "key": "booking.y2026.q1", + }, + "q2": { + "name": "Бронь средств во 2 квартале", + "key": "booking.y2026.q2", + }, + "q3": { + "name": "Бронь средств в 3 квартале", + "key": "booking.y2026.q3", + }, + "q4": { + "name": "Бронь средств в 4 квартале", + "key": "booking.y2026.q4", + }, + }, + }, + }, + }, + "god_2": { + "name": "{next_year} год", + "key": None, + "children": { + "q1": { + "name": "Бронь средств в 1 квартале", + "key": "booking.y2027.q1", + }, + "q2": { + "name": "Бронь средств во 2 квартале", + "key": "booking.y2027.q2", + }, + "q3": { + "name": "Бронь средств в 3 квартале", + "key": "booking.y2027.q3", + }, + "q4": { + "name": "Бронь средств в 4 квартале", + "key": "booking.y2027.q4", + }, + }, + }, + "kvartal_2026_goda": { + "name": "1 квартал {year} года", + "key": None, + "children": { + "korrektirovki_planovykh_znacheniy": { + "name": "Корректировки плановых значений", + "key": None, + "children": { + "adj_current": { + "name": "Текущие корректировки (= 0)", + "key": "q1.adj_current", + }, + "adj_ssp": { + "name": "Корректировка из сметы ГО", + "key": "q1.adj_ssp", + }, + "adj_reserve": { + "name": "Корректировка из резерва", + "key": "q1.adj_reserve", + }, + "adj_comment": { + "name": "Комментарий", + "key": "q1.adj_comment", + }, + "corrected_plan": { + "name": "Базовый план с учётом корректировок", + "key": "q1.corrected_plan", + }, + }, + }, + "soglasovanie_platezhey": { + "name": "Согласование платежей", + "key": None, + "children": { + "pay_date": { + "name": "Дата платежа", + "key": "q1.pay_date", + }, + "pay_amount": { + "name": "Сумма платежа", + "key": "q1.pay_amount", + }, + "pay_comment": { + "name": "Комментарий", + "key": "q1.pay_comment", + }, + "pay_act": { + "name": "Предоставление акта", + "key": "q1.pay_act", + }, + }, + }, + "fakticheskie_raskhody": { + "name": "Фактические расходы", + "key": None, + "children": { + "booking": { + "name": "Бронь квартал", + "key": "q1.booking", + }, + "actual_m1": { + "name": "Факт январь", + "key": "q1.actual_m1", + }, + "actual_m2": { + "name": "Факт февраль", + "key": "q1.actual_m2", + }, + "actual_m3": { + "name": "Факт март", + "key": "q1.actual_m3", + }, + "actual_quarter": { + "name": "Факт квартал", + "key": "q1.actual_quarter", + }, + "residual_after_booking": { + "name": "Остаток после брони 1 квартала", + "key": "q1.residual_after_booking", + }, + "residual_after_actual": { + "name": "Остаток после факта 1 квартала", + "key": "q1.residual_after_actual", + }, + }, + }, + "korrektirovka_ostatka_v_posleduyuschie_kvartaly": { + "name": "Корректировка остатка в последующие кварталы", + "key": None, + "children": { + "transfer_q2": { + "name": "Перенос во 2 квартал", + "key": "q1.transfer_q2", + }, + "transfer_q2_delay_acts": { + "name": "Задержка списания расходов / предоставления актов", + "key": "q1.transfer_q2_delay_acts", + }, + "transfer_q2_delay_procurement": { + "name": "Задержка закупочных процедур", + "key": "q1.transfer_q2_delay_procurement", + }, + "transfer_q2_economy_rf": { + "name": "Экономия (будет использована РФ)", + "key": "q1.transfer_q2_economy_rf", + }, + "transfer_next_comment": { + "name": "Комментарий переноса во 2 квартал", + "key": "q1.transfer_next_comment", + }, + "transfer_q3": { + "name": "Перенос в 3 квартал", + "key": "q1.transfer_q3", + }, + "transfer_q4": { + "name": "Перенос в 4 квартал", + "key": "q1.transfer_q4", + }, + "transfer_far_comment": { + "name": "Комментарий переноса в 3 и 4 кварталах", + "key": "q1.transfer_far_comment", + }, + "transfer_econ": { + "name": "Перенос в фонд экономии", + "key": "q1.transfer_econ", + }, + "total": { + "name": "Всего", + "key": "q1.total", + }, + }, + }, + }, + }, + "kvartal_2026_goda_2": { + "name": "2 квартал {year} года", + "key": None, + "children": { + "korrektirovka_bazovogo_plana": { + "name": "Корректировка базового плана", + "key": None, + "children": { + "target_change": { + "name": "Изменение целевого назначения перенесённой экономии (= 0)", + "key": "q2.target_change", + }, + "base_correction": { + "name": "Корректировка статей базового плана (= 0)", + "key": "q2.base_correction", + }, + "base_correction_comment": { + "name": "Комментарий изменения базового плана", + "key": "q2.base_correction_comment", + }, + "revision_inc": { + "name": "ДФиП: увеличение плана (> 0)", + "key": "q2.revision_inc", + }, + "revision_seq": { + "name": "ДФиП: секвестр плана (< 0)", + "key": "q2.revision_seq", + }, + "revision_comment": { + "name": "Комментарий", + "key": "q2.revision_comment", + }, + "new_plan": { + "name": "Скорректированный план на подпись", + "key": "q2.new_plan", + }, + }, + }, + "korrektirovki_planovykh_znacheniy": { + "name": "Корректировки плановых значений", + "key": None, + "children": { + "adj_current": { + "name": "Текущие корректировки (= 0)", + "key": "q2.adj_current", + }, + "adj_ssp": { + "name": "Корректировка из сметы ГО", + "key": "q2.adj_ssp", + }, + "adj_reserve": { + "name": "Корректировка из резерва", + "key": "q2.adj_reserve", + }, + "adj_comment": { + "name": "Комментарий", + "key": "q2.adj_comment", + }, + "corrected_plan": { + "name": "Скорректированный план с учётом корректировок", + "key": "q2.corrected_plan", + }, + }, + }, + "soglasovanie_platezhey": { + "name": "Согласование платежей", + "key": None, + "children": { + "pay_date": { + "name": "Дата платежа", + "key": "q2.pay_date", + }, + "pay_amount": { + "name": "Сумма платежа", + "key": "q2.pay_amount", + }, + "pay_comment": { + "name": "Комментарий", + "key": "q2.pay_comment", + }, + "pay_act": { + "name": "Предоставление акта", + "key": "q2.pay_act", + }, + }, + }, + "fakticheskie_raskhody": { + "name": "Фактические расходы", + "key": None, + "children": { + "booking": { + "name": "Бронь квартал", + "key": "q2.booking", + }, + "actual_m1": { + "name": "Факт апрель", + "key": "q2.actual_m1", + }, + "actual_m2": { + "name": "Факт май", + "key": "q2.actual_m2", + }, + "actual_m3": { + "name": "Факт июнь", + "key": "q2.actual_m3", + }, + "actual_quarter": { + "name": "Факт квартал", + "key": "q2.actual_quarter", + }, + "residual_after_booking": { + "name": "Остаток после брони 2 квартала", + "key": "q2.residual_after_booking", + }, + "residual_after_actual": { + "name": "Остаток после факта 2 квартала", + "key": "q2.residual_after_actual", + }, + }, + }, + "korrektirovka_ostatka_v_posleduyuschie_kvartaly": { + "name": "Корректировка остатка в последующие кварталы", + "key": None, + "children": { + "transfer_q3": { + "name": "Перенос в 3 квартал", + "key": "q2.transfer_q3", + }, + "transfer_q3_delay_acts": { + "name": "Задержка списания расходов / предоставления актов", + "key": "q2.transfer_q3_delay_acts", + }, + "transfer_q3_delay_procurement": { + "name": "Задержка закупочных процедур", + "key": "q2.transfer_q3_delay_procurement", + }, + "transfer_q3_economy_rf": { + "name": "Экономия (будет использована РФ)", + "key": "q2.transfer_q3_economy_rf", + }, + "transfer_next_comment": { + "name": "Комментарий переноса в 3 квартал", + "key": "q2.transfer_next_comment", + }, + "transfer_q4": { + "name": "Перенос в 4 квартал", + "key": "q2.transfer_q4", + }, + "transfer_far_comment": { + "name": "Комментарий переноса в 4 квартал", + "key": "q2.transfer_far_comment", + }, + "transfer_econ": { + "name": "Перенос в фонд экономии", + "key": "q2.transfer_econ", + }, + "total": { + "name": "Всего", + "key": "q2.total", + }, + }, + }, + }, + }, + "kvartal_2026_goda_3": { + "name": "3 квартал {year} года", + "key": None, + "children": { + "korrektirovka_bazovogo_plana": { + "name": "Корректировка базового плана", + "key": None, + "children": { + "target_change": { + "name": "Изменение целевого назначения перенесённой экономии (= 0)", + "key": "q3.target_change", + }, + "base_correction": { + "name": "Корректировка статей базового плана (= 0)", + "key": "q3.base_correction", + }, + "base_correction_comment": { + "name": "Комментарий изменения базового плана", + "key": "q3.base_correction_comment", + }, + "revision_inc": { + "name": "ДФиП: увеличение плана (> 0)", + "key": "q3.revision_inc", + }, + "revision_seq": { + "name": "ДФиП: секвестр плана (< 0)", + "key": "q3.revision_seq", + }, + "revision_comment": { + "name": "Комментарий", + "key": "q3.revision_comment", + }, + "new_plan": { + "name": "Скорректированный план на подпись", + "key": "q3.new_plan", + }, + }, + }, + "korrektirovki_planovykh_znacheniy": { + "name": "Корректировки плановых значений", + "key": None, + "children": { + "adj_current": { + "name": "Текущие корректировки (= 0)", + "key": "q3.adj_current", + }, + "adj_ssp": { + "name": "Корректировка из сметы ГО", + "key": "q3.adj_ssp", + }, + "adj_reserve": { + "name": "Корректировка из резерва", + "key": "q3.adj_reserve", + }, + "adj_comment": { + "name": "Комментарий", + "key": "q3.adj_comment", + }, + "corrected_plan": { + "name": "Скорректированный план с учётом корректировок", + "key": "q3.corrected_plan", + }, + }, + }, + "soglasovanie_platezhey": { + "name": "Согласование платежей", + "key": None, + "children": { + "pay_date": { + "name": "Дата платежа", + "key": "q3.pay_date", + }, + "pay_amount": { + "name": "Сумма платежа", + "key": "q3.pay_amount", + }, + "pay_comment": { + "name": "Комментарий", + "key": "q3.pay_comment", + }, + "pay_act": { + "name": "Предоставление акта", + "key": "q3.pay_act", + }, + }, + }, + "fakticheskie_raskhody": { + "name": "Фактические расходы", + "key": None, + "children": { + "booking": { + "name": "Бронь квартал", + "key": "q3.booking", + }, + "actual_m1": { + "name": "Факт июль", + "key": "q3.actual_m1", + }, + "actual_m2": { + "name": "Факт август", + "key": "q3.actual_m2", + }, + "actual_m3": { + "name": "Факт сентябрь", + "key": "q3.actual_m3", + }, + "actual_quarter": { + "name": "Факт квартал", + "key": "q3.actual_quarter", + }, + "residual_after_booking": { + "name": "Остаток после брони 3 квартала", + "key": "q3.residual_after_booking", + }, + "residual_after_actual": { + "name": "Остаток после факта 3 квартала", + "key": "q3.residual_after_actual", + }, + }, + }, + "korrektirovka_ostatka_v_posleduyuschiy_kvartal": { + "name": "Корректировка остатка в последующий квартал", + "key": None, + "children": { + "transfer_q4": { + "name": "Перенос в 4 квартал", + "key": "q3.transfer_q4", + }, + "transfer_q4_delay_acts": { + "name": "Задержка списания расходов / предоставления актов", + "key": "q3.transfer_q4_delay_acts", + }, + "transfer_q4_delay_procurement": { + "name": "Задержка закупочных процедур", + "key": "q3.transfer_q4_delay_procurement", + }, + "transfer_q4_economy_rf": { + "name": "Экономия (будет использована РФ)", + "key": "q3.transfer_q4_economy_rf", + }, + "transfer_next_comment": { + "name": "Комментарий переноса в 4 квартал", + "key": "q3.transfer_next_comment", + }, + "transfer_econ": { + "name": "Перенос в фонд экономии", + "key": "q3.transfer_econ", + }, + "total": { + "name": "Всего", + "key": "q3.total", + }, + }, + }, + }, + }, + "kvartal_2026_goda_4": { + "name": "4 квартал {year} года", + "key": None, + "children": { + "korrektirovka_bazovogo_plana": { + "name": "Корректировка базового плана", + "key": None, + "children": { + "target_change": { + "name": "Изменение целевого назначения перенесённой экономии (= 0)", + "key": "q4.target_change", + }, + "base_correction": { + "name": "Корректировка статей базового плана (= 0)", + "key": "q4.base_correction", + }, + "base_correction_comment": { + "name": "Комментарий изменения базового плана", + "key": "q4.base_correction_comment", + }, + "revision_inc": { + "name": "ДФиП: увеличение плана (> 0)", + "key": "q4.revision_inc", + }, + "revision_seq": { + "name": "ДФиП: секвестр плана (< 0)", + "key": "q4.revision_seq", + }, + "revision_comment": { + "name": "Комментарий", + "key": "q4.revision_comment", + }, + "new_plan": { + "name": "Скорректированный план на подпись", + "key": "q4.new_plan", + }, + }, + }, + "korrektirovki_planovykh_znacheniy": { + "name": "Корректировки плановых значений", + "key": None, + "children": { + "adj_current": { + "name": "Текущие корректировки (= 0)", + "key": "q4.adj_current", + }, + "adj_ssp": { + "name": "Корректировка из сметы ГО", + "key": "q4.adj_ssp", + }, + "adj_reserve": { + "name": "Корректировка из резерва", + "key": "q4.adj_reserve", + }, + "adj_comment": { + "name": "Комментарий", + "key": "q4.adj_comment", + }, + "corrected_plan": { + "name": "Скорректированный план с учётом корректировок", + "key": "q4.corrected_plan", + }, + }, + }, + "soglasovanie_platezhey": { + "name": "Согласование платежей", + "key": None, + "children": { + "pay_date": { + "name": "Дата платежа", + "key": "q4.pay_date", + }, + "pay_amount": { + "name": "Сумма платежа", + "key": "q4.pay_amount", + }, + "pay_comment": { + "name": "Комментарий", + "key": "q4.pay_comment", + }, + "pay_act": { + "name": "Предоставление акта", + "key": "q4.pay_act", + }, + }, + }, + "fakticheskie_raskhody": { + "name": "Фактические расходы", + "key": None, + "children": { + "booking": { + "name": "Бронь квартал", + "key": "q4.booking", + }, + "actual_m1": { + "name": "Факт октябрь", + "key": "q4.actual_m1", + }, + "actual_m2": { + "name": "Факт ноябрь", + "key": "q4.actual_m2", + }, + "actual_m3": { + "name": "Факт декабрь", + "key": "q4.actual_m3", + }, + "actual_spod": { + "name": "СПОД (январь)", + "key": "q4.actual_spod", + }, + "actual_quarter": { + "name": "Факт квартал (с учётом СПОД)", + "key": "q4.actual_quarter", + }, + "residual_after_booking": { + "name": "Остаток после брони 4 квартала (с учётом СПОД)", + "key": "q4.residual_after_booking", + }, + "residual_after_actual": { + "name": "Остаток после факта 4 квартала (с учётом СПОД)", + "key": "q4.residual_after_actual", + }, + }, + }, + "ekonomiya": { + "name": "Экономия", + "key": None, + "children": { + "transfer_econ": { + "name": "Перенос в фонд экономии", + "key": "q4.transfer_econ", + }, + }, + }, + }, + }, + "god_43": { + "name": "{year} год", + "key": None, + "children": { + "fact_year": { + "name": "Сумма фактических расходов за год", + "key": "totals.fact_year", + }, + "pay_year": { + "name": "Сумма оплаты за год", + "key": "totals.pay_year", + }, + }, + }, +} +FORM2_COLORS: dict = { + "OPER": { + "header.section_code": {"palette": "blue"}, + "header.item_id": {"palette": "blue"}, + "header.num_group": {"palette": "blue"}, + "header.name": {"palette": "blue"}, + "header.vsp_id": {"palette": "blue"}, + "plan.q1": {"palette": "blue"}, + "plan.q2": {"palette": "blue"}, + "plan.q3": {"palette": "blue"}, + "plan.q4": {"palette": "blue"}, + "plan.year": {"palette": "blue"}, + "plan.comment": {"palette": "blue"}, + "seq_dfip.q1": {"palette": "blue"}, + "seq_dfip.q2": {"palette": "blue"}, + "seq_dfip.q3": {"palette": "blue"}, + "seq_dfip.q4": {"palette": "blue"}, + "seq_dfip.year": {"palette": "blue"}, + "seq_dfip.justification": {"palette": "blue"}, + "seq_ssp.q1": {"palette": "blue"}, + "seq_ssp.q2": {"palette": "blue"}, + "seq_ssp.q3": {"palette": "blue"}, + "seq_ssp.q4": {"palette": "blue"}, + "seq_ssp.year": {"palette": "blue"}, + "seq_ssp.justification": {"palette": "blue"}, + "approved.q1": {"palette": "blue"}, + "approved.q2": {"palette": "blue"}, + "approved.q3": {"palette": "blue"}, + "approved.q4": {"palette": "blue"}, + "approved.year": {"palette": "blue"}, + "contract.counterparty": {"palette": "orange"}, + "contract.reference": {"palette": "orange"}, + "contract.date": {"palette": "orange"}, + "contract.subject": {"palette": "orange"}, + "contract.currency": {"palette": "orange"}, + "contract.ceiling": {"palette": "orange"}, + "contract.vat_rate": {"palette": "orange"}, + "contract.deadline": {"palette": "orange"}, + "contract.scheme": {"palette": "orange"}, + "contract.act": {"palette": "orange"}, + "contract.comment": {"palette": "orange"}, + "booking.y2026.q1": {"palette": "orange"}, + "booking.y2026.q2": {"palette": "orange"}, + "booking.y2026.q3": {"palette": "orange"}, + "booking.y2026.q4": {"palette": "orange"}, + "booking.y2027.q1": {"palette": "orange"}, + "booking.y2027.q2": {"palette": "orange"}, + "booking.y2027.q3": {"palette": "orange"}, + "booking.y2027.q4": {"palette": "orange"}, + "q1.adj_current": {"palette": "yellow"}, + "q1.adj_ssp": {"palette": "yellow"}, + "q1.adj_reserve": {"palette": "yellow"}, + "q1.adj_comment": {"palette": "yellow"}, + "q1.corrected_plan": {"palette": "yellow"}, + "q1.pay_date": {"palette": "blue"}, + "q1.pay_amount": {"palette": "blue"}, + "q1.pay_comment": {"palette": "blue"}, + "q1.pay_act": {"palette": "blue"}, + "q1.booking": {"palette": "orange"}, + "q1.actual_m1": {"palette": "green"}, + "q1.actual_m2": {"palette": "green"}, + "q1.actual_m3": {"palette": "green"}, + "q1.actual_quarter": {"palette": "green"}, + "q1.residual_after_booking": {"palette": "orange"}, + "q1.residual_after_actual": {"palette": "green"}, + "q1.transfer_q2": {"palette": "red"}, + "q1.transfer_q2_delay_acts": {"palette": "red"}, + "q1.transfer_q2_delay_procurement": {"palette": "red"}, + "q1.transfer_q2_economy_rf": {"palette": "red"}, + "q1.transfer_next_comment": {"palette": "red"}, + "q1.transfer_q3": {"palette": "red"}, + "q1.transfer_q4": {"palette": "red"}, + "q1.transfer_far_comment": {"palette": "red"}, + "q1.transfer_econ": {"palette": "red"}, + "q1.total": {"palette": "red"}, + "q2.target_change": {"palette": "red"}, + "q2.base_correction": {"palette": "red"}, + "q2.base_correction_comment": {"palette": "red"}, + "q2.revision_inc": {"palette": "yellow"}, + "q2.revision_seq": {"palette": "yellow"}, + "q2.revision_comment": {"palette": "yellow"}, + "q2.new_plan": {"palette": "yellow"}, + "q2.adj_current": {"palette": "yellow"}, + "q2.adj_ssp": {"palette": "yellow"}, + "q2.adj_reserve": {"palette": "yellow"}, + "q2.adj_comment": {"palette": "yellow"}, + "q2.corrected_plan": {"palette": "yellow"}, + "q2.pay_date": {"palette": "blue"}, + "q2.pay_amount": {"palette": "blue"}, + "q2.pay_comment": {"palette": "blue"}, + "q2.pay_act": {"palette": "blue"}, + "q2.booking": {"palette": "orange"}, + "q2.actual_m1": {"palette": "green"}, + "q2.actual_m2": {"palette": "green"}, + "q2.actual_m3": {"palette": "green"}, + "q2.actual_quarter": {"palette": "green"}, + "q2.residual_after_booking": {"palette": "orange"}, + "q2.residual_after_actual": {"palette": "green"}, + "q2.transfer_q3": {"palette": "red"}, + "q2.transfer_q3_delay_acts": {"palette": "red"}, + "q2.transfer_q3_delay_procurement": {"palette": "red"}, + "q2.transfer_q3_economy_rf": {"palette": "red"}, + "q2.transfer_next_comment": {"palette": "red"}, + "q2.transfer_q4": {"palette": "red"}, + "q2.transfer_far_comment": {"palette": "red"}, + "q2.transfer_econ": {"palette": "red"}, + "q2.total": {"palette": "red"}, + "q3.target_change": {"palette": "red"}, + "q3.base_correction": {"palette": "red"}, + "q3.base_correction_comment": {"palette": "red"}, + "q3.revision_inc": {"palette": "yellow"}, + "q3.revision_seq": {"palette": "yellow"}, + "q3.revision_comment": {"palette": "yellow"}, + "q3.new_plan": {"palette": "yellow"}, + "q3.adj_current": {"palette": "yellow"}, + "q3.adj_ssp": {"palette": "yellow"}, + "q3.adj_reserve": {"palette": "yellow"}, + "q3.adj_comment": {"palette": "yellow"}, + "q3.corrected_plan": {"palette": "yellow"}, + "q3.pay_date": {"palette": "blue"}, + "q3.pay_amount": {"palette": "blue"}, + "q3.pay_comment": {"palette": "blue"}, + "q3.pay_act": {"palette": "blue"}, + "q3.booking": {"palette": "orange"}, + "q3.actual_m1": {"palette": "green"}, + "q3.actual_m2": {"palette": "green"}, + "q3.actual_m3": {"palette": "green"}, + "q3.actual_quarter": {"palette": "green"}, + "q3.residual_after_booking": {"palette": "orange"}, + "q3.residual_after_actual": {"palette": "green"}, + "q3.transfer_q4": {"palette": "red"}, + "q3.transfer_q4_delay_acts": {"palette": "red"}, + "q3.transfer_q4_delay_procurement": {"palette": "red"}, + "q3.transfer_q4_economy_rf": {"palette": "red"}, + "q3.transfer_next_comment": {"palette": "red"}, + "q3.transfer_econ": {"palette": "red"}, + "q3.total": {"palette": "red"}, + "q4.target_change": {"palette": "red"}, + "q4.base_correction": {"palette": "red"}, + "q4.base_correction_comment": {"palette": "red"}, + "q4.revision_inc": {"palette": "yellow"}, + "q4.revision_seq": {"palette": "yellow"}, + "q4.revision_comment": {"palette": "yellow"}, + "q4.new_plan": {"palette": "yellow"}, + "q4.adj_current": {"palette": "yellow"}, + "q4.adj_ssp": {"palette": "yellow"}, + "q4.adj_reserve": {"palette": "yellow"}, + "q4.adj_comment": {"palette": "yellow"}, + "q4.corrected_plan": {"palette": "yellow"}, + "q4.pay_date": {"palette": "blue"}, + "q4.pay_amount": {"palette": "blue"}, + "q4.pay_comment": {"palette": "blue"}, + "q4.pay_act": {"palette": "blue"}, + "q4.booking": {"palette": "orange"}, + "q4.actual_m1": {"palette": "green"}, + "q4.actual_m2": {"palette": "green"}, + "q4.actual_m3": {"palette": "green"}, + "q4.actual_spod": {"palette": "green"}, + "q4.actual_quarter": {"palette": "green"}, + "q4.residual_after_booking": {"palette": "orange"}, + "q4.residual_after_actual": {"palette": "green"}, + "q4.transfer_econ": {"palette": "red"}, + "totals.fact_year": {"palette": "green"}, + "totals.pay_year": {"palette": "blue"}, + }, + "AHR": { + "header.section_code": {"palette": "green"}, + "header.item_id": {"palette": "green"}, + "header.num_group": {"palette": "green"}, + "header.name": {"palette": "green"}, + "header.vsp_id": {"palette": "green"}, + "plan.q1": {"palette": "green"}, + "plan.q2": {"palette": "green"}, + "plan.q3": {"palette": "green"}, + "plan.q4": {"palette": "green"}, + "plan.year": {"palette": "green"}, + "plan.comment": {"palette": "green"}, + "seq_dfip.q1": {"palette": "green"}, + "seq_dfip.q2": {"palette": "green"}, + "seq_dfip.q3": {"palette": "green"}, + "seq_dfip.q4": {"palette": "green"}, + "seq_dfip.year": {"palette": "green"}, + "seq_dfip.justification": {"palette": "green"}, + "seq_ssp.q1": {"palette": "green"}, + "seq_ssp.q2": {"palette": "green"}, + "seq_ssp.q3": {"palette": "green"}, + "seq_ssp.q4": {"palette": "green"}, + "seq_ssp.year": {"palette": "green"}, + "seq_ssp.justification": {"palette": "green"}, + "approved.q1": {"palette": "green"}, + "approved.q2": {"palette": "green"}, + "approved.q3": {"palette": "green"}, + "approved.q4": {"palette": "green"}, + "approved.year": {"palette": "green"}, + "contract.counterparty": {"palette": "orange"}, + "contract.reference": {"palette": "orange"}, + "contract.date": {"palette": "orange"}, + "contract.subject": {"palette": "orange"}, + "contract.currency": {"palette": "orange"}, + "contract.ceiling": {"palette": "orange"}, + "contract.vat_rate": {"palette": "orange"}, + "contract.deadline": {"palette": "orange"}, + "contract.scheme": {"palette": "orange"}, + "contract.act": {"palette": "orange"}, + "contract.comment": {"palette": "orange"}, + "booking.y2026.q1": {"palette": "orange"}, + "booking.y2026.q2": {"palette": "orange"}, + "booking.y2026.q3": {"palette": "orange"}, + "booking.y2026.q4": {"palette": "orange"}, + "booking.y2027.q1": {"palette": "orange"}, + "booking.y2027.q2": {"palette": "orange"}, + "booking.y2027.q3": {"palette": "orange"}, + "booking.y2027.q4": {"palette": "orange"}, + "q1.adj_current": {"palette": "yellow"}, + "q1.adj_ssp": {"palette": "yellow"}, + "q1.adj_reserve": {"palette": "yellow"}, + "q1.adj_comment": {"palette": "yellow"}, + "q1.corrected_plan": {"palette": "yellow"}, + "q1.pay_date": {"palette": "blue"}, + "q1.pay_amount": {"palette": "blue"}, + "q1.pay_comment": {"palette": "blue"}, + "q1.pay_act": {"palette": "blue"}, + "q1.booking": {"palette": "orange"}, + "q1.actual_m1": {"palette": "green"}, + "q1.actual_m2": {"palette": "green"}, + "q1.actual_m3": {"palette": "green"}, + "q1.actual_quarter": {"palette": "green"}, + "q1.residual_after_booking": {"palette": "orange"}, + "q1.residual_after_actual": {"palette": "green"}, + "q1.transfer_q2": {"palette": "red"}, + "q1.transfer_q2_delay_acts": {"palette": "red"}, + "q1.transfer_q2_delay_procurement": {"palette": "red"}, + "q1.transfer_q2_economy_rf": {"palette": "red"}, + "q1.transfer_next_comment": {"palette": "red"}, + "q1.transfer_q3": {"palette": "red"}, + "q1.transfer_q4": {"palette": "red"}, + "q1.transfer_far_comment": {"palette": "red"}, + "q1.transfer_econ": {"palette": "red"}, + "q1.total": {"palette": "red"}, + "q2.target_change": {"palette": "red"}, + "q2.base_correction": {"palette": "red"}, + "q2.base_correction_comment": {"palette": "red"}, + "q2.revision_inc": {"palette": "yellow"}, + "q2.revision_seq": {"palette": "yellow"}, + "q2.revision_comment": {"palette": "yellow"}, + "q2.new_plan": {"palette": "yellow"}, + "q2.adj_current": {"palette": "yellow"}, + "q2.adj_ssp": {"palette": "yellow"}, + "q2.adj_reserve": {"palette": "yellow"}, + "q2.adj_comment": {"palette": "yellow"}, + "q2.corrected_plan": {"palette": "yellow"}, + "q2.pay_date": {"palette": "blue"}, + "q2.pay_amount": {"palette": "blue"}, + "q2.pay_comment": {"palette": "blue"}, + "q2.pay_act": {"palette": "blue"}, + "q2.booking": {"palette": "orange"}, + "q2.actual_m1": {"palette": "green"}, + "q2.actual_m2": {"palette": "green"}, + "q2.actual_m3": {"palette": "green"}, + "q2.actual_quarter": {"palette": "green"}, + "q2.residual_after_booking": {"palette": "orange"}, + "q2.residual_after_actual": {"palette": "green"}, + "q2.transfer_q3": {"palette": "red"}, + "q2.transfer_q3_delay_acts": {"palette": "red"}, + "q2.transfer_q3_delay_procurement": {"palette": "red"}, + "q2.transfer_q3_economy_rf": {"palette": "red"}, + "q2.transfer_next_comment": {"palette": "red"}, + "q2.transfer_q4": {"palette": "red"}, + "q2.transfer_far_comment": {"palette": "red"}, + "q2.transfer_econ": {"palette": "red"}, + "q2.total": {"palette": "red"}, + "q3.target_change": {"palette": "red"}, + "q3.base_correction": {"palette": "red"}, + "q3.base_correction_comment": {"palette": "red"}, + "q3.revision_inc": {"palette": "yellow"}, + "q3.revision_seq": {"palette": "yellow"}, + "q3.revision_comment": {"palette": "yellow"}, + "q3.new_plan": {"palette": "yellow"}, + "q3.adj_current": {"palette": "yellow"}, + "q3.adj_ssp": {"palette": "yellow"}, + "q3.adj_reserve": {"palette": "yellow"}, + "q3.adj_comment": {"palette": "yellow"}, + "q3.corrected_plan": {"palette": "yellow"}, + "q3.pay_date": {"palette": "blue"}, + "q3.pay_amount": {"palette": "blue"}, + "q3.pay_comment": {"palette": "blue"}, + "q3.pay_act": {"palette": "blue"}, + "q3.booking": {"palette": "orange"}, + "q3.actual_m1": {"palette": "green"}, + "q3.actual_m2": {"palette": "green"}, + "q3.actual_m3": {"palette": "green"}, + "q3.actual_quarter": {"palette": "green"}, + "q3.residual_after_booking": {"palette": "orange"}, + "q3.residual_after_actual": {"palette": "green"}, + "q3.transfer_q4": {"palette": "red"}, + "q3.transfer_q4_delay_acts": {"palette": "red"}, + "q3.transfer_q4_delay_procurement": {"palette": "red"}, + "q3.transfer_q4_economy_rf": {"palette": "red"}, + "q3.transfer_next_comment": {"palette": "red"}, + "q3.transfer_econ": {"palette": "red"}, + "q3.total": {"palette": "red"}, + "q4.target_change": {"palette": "red"}, + "q4.base_correction": {"palette": "red"}, + "q4.base_correction_comment": {"palette": "red"}, + "q4.revision_inc": {"palette": "yellow"}, + "q4.revision_seq": {"palette": "yellow"}, + "q4.revision_comment": {"palette": "yellow"}, + "q4.new_plan": {"palette": "yellow"}, + "q4.adj_current": {"palette": "yellow"}, + "q4.adj_ssp": {"palette": "yellow"}, + "q4.adj_reserve": {"palette": "yellow"}, + "q4.adj_comment": {"palette": "yellow"}, + "q4.corrected_plan": {"palette": "yellow"}, + "q4.pay_date": {"palette": "blue"}, + "q4.pay_amount": {"palette": "blue"}, + "q4.pay_comment": {"palette": "blue"}, + "q4.pay_act": {"palette": "blue"}, + "q4.booking": {"palette": "orange"}, + "q4.actual_m1": {"palette": "green"}, + "q4.actual_m2": {"palette": "green"}, + "q4.actual_m3": {"palette": "green"}, + "q4.actual_spod": {"palette": "green"}, + "q4.actual_quarter": {"palette": "green"}, + "q4.residual_after_booking": {"palette": "orange"}, + "q4.residual_after_actual": {"palette": "green"}, + "q4.transfer_econ": {"palette": "red"}, + "totals.fact_year": {"palette": "green"}, + "totals.pay_year": {"palette": "blue"}, + }, + "CAP": { + "header.section_code": {"palette": "orange"}, + "header.item_id": {"palette": "orange"}, + "header.num_group": {"palette": "orange"}, + "header.name": {"palette": "orange"}, + "header.vsp_id": {"palette": "orange"}, + "plan.q1": {"palette": "orange"}, + "plan.q2": {"palette": "orange"}, + "plan.q3": {"palette": "orange"}, + "plan.q4": {"palette": "orange"}, + "plan.year": {"palette": "orange"}, + "plan.comment": {"palette": "orange"}, + "seq_dfip.q1": {"palette": "orange"}, + "seq_dfip.q2": {"palette": "orange"}, + "seq_dfip.q3": {"palette": "orange"}, + "seq_dfip.q4": {"palette": "orange"}, + "seq_dfip.year": {"palette": "orange"}, + "seq_dfip.justification": {"palette": "orange"}, + "seq_ssp.q1": {"palette": "orange"}, + "seq_ssp.q2": {"palette": "orange"}, + "seq_ssp.q3": {"palette": "orange"}, + "seq_ssp.q4": {"palette": "orange"}, + "seq_ssp.year": {"palette": "orange"}, + "seq_ssp.justification": {"palette": "orange"}, + "approved.q1": {"palette": "orange"}, + "approved.q2": {"palette": "orange"}, + "approved.q3": {"palette": "orange"}, + "approved.q4": {"palette": "orange"}, + "approved.year": {"palette": "orange"}, + "contract.counterparty": {"palette": "orange"}, + "contract.reference": {"palette": "orange"}, + "contract.date": {"palette": "orange"}, + "contract.subject": {"palette": "orange"}, + "contract.currency": {"palette": "orange"}, + "contract.ceiling": {"palette": "orange"}, + "contract.vat_rate": {"palette": "orange"}, + "contract.deadline": {"palette": "orange"}, + "contract.scheme": {"palette": "orange"}, + "contract.act": {"palette": "orange"}, + "contract.comment": {"palette": "orange"}, + "booking.y2026.q1": {"palette": "orange"}, + "booking.y2026.q2": {"palette": "orange"}, + "booking.y2026.q3": {"palette": "orange"}, + "booking.y2026.q4": {"palette": "orange"}, + "booking.y2027.q1": {"palette": "orange"}, + "booking.y2027.q2": {"palette": "orange"}, + "booking.y2027.q3": {"palette": "orange"}, + "booking.y2027.q4": {"palette": "orange"}, + "q1.adj_current": {"palette": "yellow"}, + "q1.adj_ssp": {"palette": "yellow"}, + "q1.adj_reserve": {"palette": "yellow"}, + "q1.adj_comment": {"palette": "yellow"}, + "q1.corrected_plan": {"palette": "yellow"}, + "q1.pay_date": {"palette": "blue"}, + "q1.pay_amount": {"palette": "blue"}, + "q1.pay_comment": {"palette": "blue"}, + "q1.pay_act": {"palette": "blue"}, + "q1.booking": {"palette": "orange"}, + "q1.actual_m1": {"palette": "green"}, + "q1.actual_m2": {"palette": "green"}, + "q1.actual_m3": {"palette": "green"}, + "q1.actual_quarter": {"palette": "green"}, + "q1.residual_after_booking": {"palette": "orange"}, + "q1.residual_after_actual": {"palette": "green"}, + "q1.transfer_q2": {"palette": "red"}, + "q1.transfer_q2_delay_acts": {"palette": "red"}, + "q1.transfer_q2_delay_procurement": {"palette": "red"}, + "q1.transfer_q2_economy_rf": {"palette": "red"}, + "q1.transfer_next_comment": {"palette": "red"}, + "q1.transfer_q3": {"palette": "red"}, + "q1.transfer_q4": {"palette": "red"}, + "q1.transfer_far_comment": {"palette": "red"}, + "q1.transfer_econ": {"palette": "red"}, + "q1.total": {"palette": "red"}, + "q2.target_change": {"palette": "red"}, + "q2.base_correction": {"palette": "red"}, + "q2.base_correction_comment": {"palette": "red"}, + "q2.revision_inc": {"palette": "yellow"}, + "q2.revision_seq": {"palette": "yellow"}, + "q2.revision_comment": {"palette": "yellow"}, + "q2.new_plan": {"palette": "yellow"}, + "q2.adj_current": {"palette": "yellow"}, + "q2.adj_ssp": {"palette": "yellow"}, + "q2.adj_reserve": {"palette": "yellow"}, + "q2.adj_comment": {"palette": "yellow"}, + "q2.corrected_plan": {"palette": "yellow"}, + "q2.pay_date": {"palette": "blue"}, + "q2.pay_amount": {"palette": "blue"}, + "q2.pay_comment": {"palette": "blue"}, + "q2.pay_act": {"palette": "blue"}, + "q2.booking": {"palette": "orange"}, + "q2.actual_m1": {"palette": "green"}, + "q2.actual_m2": {"palette": "green"}, + "q2.actual_m3": {"palette": "green"}, + "q2.actual_quarter": {"palette": "green"}, + "q2.residual_after_booking": {"palette": "orange"}, + "q2.residual_after_actual": {"palette": "green"}, + "q2.transfer_q3": {"palette": "red"}, + "q2.transfer_q3_delay_acts": {"palette": "red"}, + "q2.transfer_q3_delay_procurement": {"palette": "red"}, + "q2.transfer_q3_economy_rf": {"palette": "red"}, + "q2.transfer_next_comment": {"palette": "red"}, + "q2.transfer_q4": {"palette": "red"}, + "q2.transfer_far_comment": {"palette": "red"}, + "q2.transfer_econ": {"palette": "red"}, + "q2.total": {"palette": "red"}, + "q3.target_change": {"palette": "red"}, + "q3.base_correction": {"palette": "red"}, + "q3.base_correction_comment": {"palette": "red"}, + "q3.revision_inc": {"palette": "yellow"}, + "q3.revision_seq": {"palette": "yellow"}, + "q3.revision_comment": {"palette": "yellow"}, + "q3.new_plan": {"palette": "yellow"}, + "q3.adj_current": {"palette": "yellow"}, + "q3.adj_ssp": {"palette": "yellow"}, + "q3.adj_reserve": {"palette": "yellow"}, + "q3.adj_comment": {"palette": "yellow"}, + "q3.corrected_plan": {"palette": "yellow"}, + "q3.pay_date": {"palette": "blue"}, + "q3.pay_amount": {"palette": "blue"}, + "q3.pay_comment": {"palette": "blue"}, + "q3.pay_act": {"palette": "blue"}, + "q3.booking": {"palette": "orange"}, + "q3.actual_m1": {"palette": "green"}, + "q3.actual_m2": {"palette": "green"}, + "q3.actual_m3": {"palette": "green"}, + "q3.actual_quarter": {"palette": "green"}, + "q3.residual_after_booking": {"palette": "orange"}, + "q3.residual_after_actual": {"palette": "green"}, + "q3.transfer_q4": {"palette": "red"}, + "q3.transfer_q4_delay_acts": {"palette": "red"}, + "q3.transfer_q4_delay_procurement": {"palette": "red"}, + "q3.transfer_q4_economy_rf": {"palette": "red"}, + "q3.transfer_next_comment": {"palette": "red"}, + "q3.transfer_econ": {"palette": "red"}, + "q3.total": {"palette": "red"}, + "q4.target_change": {"palette": "red"}, + "q4.base_correction": {"palette": "red"}, + "q4.base_correction_comment": {"palette": "red"}, + "q4.revision_inc": {"palette": "yellow"}, + "q4.revision_seq": {"palette": "yellow"}, + "q4.revision_comment": {"palette": "yellow"}, + "q4.new_plan": {"palette": "yellow"}, + "q4.adj_current": {"palette": "yellow"}, + "q4.adj_ssp": {"palette": "yellow"}, + "q4.adj_reserve": {"palette": "yellow"}, + "q4.adj_comment": {"palette": "yellow"}, + "q4.corrected_plan": {"palette": "yellow"}, + "q4.pay_date": {"palette": "blue"}, + "q4.pay_amount": {"palette": "blue"}, + "q4.pay_comment": {"palette": "blue"}, + "q4.pay_act": {"palette": "blue"}, + "q4.booking": {"palette": "orange"}, + "q4.actual_m1": {"palette": "green"}, + "q4.actual_m2": {"palette": "green"}, + "q4.actual_m3": {"palette": "green"}, + "q4.actual_spod": {"palette": "green"}, + "q4.actual_quarter": {"palette": "green"}, + "q4.residual_after_booking": {"palette": "orange"}, + "q4.residual_after_actual": {"palette": "green"}, + "q4.transfer_econ": {"palette": "red"}, + "totals.fact_year": {"palette": "green"}, + "totals.pay_year": {"palette": "blue"}, + }, +} diff --git a/api/src/services/export_service/export_normalizers.py b/api/src/services/export_service/export_normalizers.py index dea1bbd..1f67d87 100644 --- a/api/src/services/export_service/export_normalizers.py +++ b/api/src/services/export_service/export_normalizers.py @@ -249,6 +249,34 @@ class SmetaRowNormalizer: return cur +class Form2DepthRowNormalizer: + """Для FORM_2 (Операц/АХР/КВ Сметы РФ): в отличие от Form1DepthRowNormalizer, + поля header.* не поднимаются на верхний уровень — FORM_2_DEPTH_COLUMNS + ожидает их как header.section_code, header.vsp_id и т.д.""" + + def __init__(self, serializer: ExcelValueSerializer): + self.serializer = serializer + + def normalize(self, data: dict[str, Any]) -> dict[str, Any]: + normalized: dict[str, Any] = {} + self._normalize_depth(normalized=normalized, original=data) + return normalized + + def _normalize_depth( + self, + normalized: dict[str, Any], + original: dict[str, Any], + prefix: str = "", + ) -> None: + for key, value in original.items(): + if key == "line_id": + continue + if isinstance(value, dict): + self._normalize_depth(normalized=normalized, original=value, prefix=f"{prefix}{key}.") + else: + normalized[f"{prefix}{key}"] = value + + class Form3DepthRowNormalizer: def __init__(self, serializer: ExcelValueSerializer): self.serializer = serializer diff --git a/api/src/services/export_service/export_service.py b/api/src/services/export_service/export_service.py index 00fe243..89c1d16 100644 --- a/api/src/services/export_service/export_service.py +++ b/api/src/services/export_service/export_service.py @@ -27,13 +27,16 @@ from src.services.budget_form_service import BudgetFormService from src.services.export_service.export_normalizers import ( ExcelValueSerializer, Form1DepthRowNormalizer, + Form2DepthRowNormalizer, Form3DepthRowNormalizer, SmetaRowNormalizer, ) from src.services.export_service.export_mappings import ( FORM1_COLORS, FORM1_DEPTH_COLUMNS, + FORM2_COLORS, FORM2_DEPTH_AHR_SUB_COLUMNS, + FORM2_DEPTH_COLUMNS, FORM3_COLORS, FORM4_COLORS, FORM4_DEPTH_COLUMNS, @@ -58,6 +61,7 @@ from src.services.export_service.export_writers import ( from src.services.project_service import ProjectService from src.services.sheet_service import SheetService from src.services.summary_service import SummaryService +from src.repository.vsp_repository import VSPRepository XLSX_MEDIA_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" ZIP_MEDIA_TYPE = "application/zip" @@ -100,8 +104,10 @@ class ExportService: self.sheet_service = SheetService(db) self.project_service = ProjectService(db) self.summary_service = SummaryService(db) + self.vsp_repo = VSPRepository(db) self.value_serializer = ExcelValueSerializer() self.form1_row_normalizer = Form1DepthRowNormalizer(self.value_serializer) + self.form2_row_normalizer = Form2DepthRowNormalizer(self.value_serializer) self.form3_row_normalizer = Form3DepthRowNormalizer(self.value_serializer) self.smeta_row_normalizer = SmetaRowNormalizer() self.sheet_writers: dict[str, TabularSheetWriter] = { @@ -441,6 +447,8 @@ class ExportService: direction=plan.effective_direction, sections=plan.effective_sections, ) + if form.form_type.code == FormTypeEnum.FORM_2.value and plan.sheet_name in ("OPER", "AHR", "CAP"): + await self._resolve_form2_vsp_numbers(rows) sheet_loaded_at = perf_counter() # Этап 4: рендер листа уводим с event loop, чтобы экспорт не блокировал API. @@ -897,6 +905,28 @@ class ExportService: "right_color": "#9EAFA3" if is_group_end else "#EDF0F2", } + async def _resolve_form2_vsp_numbers(self, rows: list[tuple]) -> None: + """На экране колонка «ВСП РФ» показывает registration_number, а не id, + который реально лежит в data.header.vsp_id — подменяем перед записью + в Excel, одним запросом на все встретившиеся id (включая закрытые ВСП).""" + headers_with_vsp: list[dict] = [] + vsp_ids: set[int] = set() + for row in rows: + if len(row) <= 3 or not isinstance(row[3], dict): + continue + header = row[3].get("header") + vsp_id = header.get("vsp_id") if isinstance(header, dict) else None + if isinstance(vsp_id, int): + headers_with_vsp.append(header) + vsp_ids.add(vsp_id) + if not vsp_ids: + return + reg_numbers = await self.vsp_repo.get_reg_numbers_by_ids(list(vsp_ids)) + for header in headers_with_vsp: + reg_number = reg_numbers.get(header["vsp_id"]) + if reg_number is not None: + header["vsp_id"] = reg_number + def _create_xlsxwriter_sheet_writers( self, workbook: XlsxWorkbook, @@ -920,26 +950,38 @@ class ExportService: } if form_type_code == FormTypeEnum.FORM_4.value: writer_configs = { - "OPER": (FORM4_OPER_DEPTH_COLUMNS, FORM4_OPER_COLORS), - "AHR": (FORM4_DEPTH_COLUMNS, FORM4_COLORS["AHR"]), - "CAP": (FORM4_DEPTH_COLUMNS, FORM4_COLORS["CAP"]), - "STRUCTURE": (FORM4_STRUCTURE_DEPTH_COLUMNS, FORM4_STRUCTURE_COLORS), + "OPER": (FORM4_OPER_DEPTH_COLUMNS, FORM4_OPER_COLORS, self.form1_row_normalizer), + "AHR": (FORM4_DEPTH_COLUMNS, FORM4_COLORS["AHR"], self.form1_row_normalizer), + "CAP": (FORM4_DEPTH_COLUMNS, FORM4_COLORS["CAP"], self.form1_row_normalizer), + "STRUCTURE": (FORM4_STRUCTURE_DEPTH_COLUMNS, FORM4_STRUCTURE_COLORS, self.form1_row_normalizer), + } + elif form_type_code == FormTypeEnum.FORM_2.value: + # AURORA-1902: FORM_2 (Операц/АХР/КВ Сметы РФ) имеет свою раскладку колонок + # (v3.v_form2_view), раньше ошибочно экспортировалась раскладкой формы 1. + writer_configs = { + "OPER": (FORM2_DEPTH_COLUMNS, FORM2_COLORS["OPER"], self.form2_row_normalizer), + "AHR": (FORM2_DEPTH_COLUMNS, FORM2_COLORS["AHR"], self.form2_row_normalizer), + "CAP": (FORM2_DEPTH_COLUMNS, FORM2_COLORS["CAP"], self.form2_row_normalizer), + "AHR_RENT": (FORM2_DEPTH_AHR_SUB_COLUMNS, None, self.form1_row_normalizer), + "AHR_UTILITY": (FORM2_DEPTH_AHR_SUB_COLUMNS, None, self.form1_row_normalizer), + "AHR_SECURITY": (FORM2_DEPTH_AHR_SUB_COLUMNS, None, self.form1_row_normalizer), + "STRUCTURE": (FORM4_STRUCTURE_DEPTH_COLUMNS, FORM4_STRUCTURE_COLORS, self.form1_row_normalizer), } else: writer_configs = { - "OPER": (FORM1_DEPTH_COLUMNS, FORM1_COLORS["OPER"]), - "AHR": (FORM1_DEPTH_COLUMNS, FORM1_COLORS["AHR"]), - "CAP": (FORM1_DEPTH_COLUMNS, FORM1_COLORS["CAP"]), - "AHR_RENT": (FORM2_DEPTH_AHR_SUB_COLUMNS, None), - "AHR_UTILITY": (FORM2_DEPTH_AHR_SUB_COLUMNS, None), - "AHR_SECURITY": (FORM2_DEPTH_AHR_SUB_COLUMNS, None), - "STRUCTURE": (FORM4_STRUCTURE_DEPTH_COLUMNS, FORM4_STRUCTURE_COLORS), + "OPER": (FORM1_DEPTH_COLUMNS, FORM1_COLORS["OPER"], self.form1_row_normalizer), + "AHR": (FORM1_DEPTH_COLUMNS, FORM1_COLORS["AHR"], self.form1_row_normalizer), + "CAP": (FORM1_DEPTH_COLUMNS, FORM1_COLORS["CAP"], self.form1_row_normalizer), + "AHR_RENT": (FORM2_DEPTH_AHR_SUB_COLUMNS, None, self.form1_row_normalizer), + "AHR_UTILITY": (FORM2_DEPTH_AHR_SUB_COLUMNS, None, self.form1_row_normalizer), + "AHR_SECURITY": (FORM2_DEPTH_AHR_SUB_COLUMNS, None, self.form1_row_normalizer), + "STRUCTURE": (FORM4_STRUCTURE_DEPTH_COLUMNS, FORM4_STRUCTURE_COLORS, self.form1_row_normalizer), } - for sheet_name, (columns, colors) in writer_configs.items(): + for sheet_name, (columns, colors, row_normalizer) in writer_configs.items(): writers[sheet_name] = XlsxDepthSheetWriter( workbook=workbook, columns_dict=render_column_years(columns, year), - row_normalizer=self.form1_row_normalizer.normalize, + row_normalizer=row_normalizer.normalize, value_serializer=self.value_serializer.to_excel_value, colors_config=colors, ) diff --git a/api/tests/unit/test_export_form2_mapping.py b/api/tests/unit/test_export_form2_mapping.py new file mode 100644 index 0000000..aedd413 --- /dev/null +++ b/api/tests/unit/test_export_form2_mapping.py @@ -0,0 +1,175 @@ +from unittest.mock import AsyncMock + +import pytest +from xlsxwriter import Workbook as XlsxWorkbook + +from src.db.models.form_type import FormTypeEnum +from src.services.export_service import ExportService +from src.services.export_service.export_mappings import ( + FORM1_DEPTH_COLUMNS, + FORM2_COLORS, + FORM2_DEPTH_COLUMNS, + render_column_years, +) +from src.services.export_service.export_normalizers import ( + ExcelValueSerializer, + Form2DepthRowNormalizer, +) +from src.services.export_service.export_writers import XlsxDepthSheetWriter + +# Ожидаемый порядок листьев = порядок колонок экрана (web/src/.../FORM_2/OPER.js), +# минус "header.vsp_address" (AURORA-1902: лишний столбец, которого нет в форме РФ). +EXPECTED_LEAF_ORDER = [ + "header.section_code", "header.item_id", "header.num_group", "header.name", "header.vsp_id", + "plan.q1", "plan.q2", "plan.q3", "plan.q4", "plan.year", "plan.comment", + "seq_dfip.q1", "seq_dfip.q2", "seq_dfip.q3", "seq_dfip.q4", "seq_dfip.year", "seq_dfip.justification", + "seq_ssp.q1", "seq_ssp.q2", "seq_ssp.q3", "seq_ssp.q4", "seq_ssp.year", "seq_ssp.justification", + "approved.q1", "approved.q2", "approved.q3", "approved.q4", "approved.year", + "contract.counterparty", "contract.reference", "contract.date", "contract.subject", + "contract.currency", "contract.ceiling", "contract.vat_rate", "contract.deadline", + "contract.scheme", "contract.act", "contract.comment", + "booking.y2026.q1", "booking.y2026.q2", "booking.y2026.q3", "booking.y2026.q4", + "booking.y2027.q1", "booking.y2027.q2", "booking.y2027.q3", "booking.y2027.q4", + "q1.adj_current", "q1.adj_ssp", "q1.adj_reserve", "q1.adj_comment", "q1.corrected_plan", + "q1.pay_date", "q1.pay_amount", "q1.pay_comment", "q1.pay_act", + "q1.booking", "q1.actual_m1", "q1.actual_m2", "q1.actual_m3", "q1.actual_quarter", + "q1.residual_after_booking", "q1.residual_after_actual", + "q1.transfer_q2", "q1.transfer_q2_delay_acts", "q1.transfer_q2_delay_procurement", + "q1.transfer_q2_economy_rf", "q1.transfer_next_comment", "q1.transfer_q3", "q1.transfer_q4", + "q1.transfer_far_comment", "q1.transfer_econ", "q1.total", + "q2.target_change", "q2.base_correction", "q2.base_correction_comment", + "q2.revision_inc", "q2.revision_seq", "q2.revision_comment", "q2.new_plan", + "q2.adj_current", "q2.adj_ssp", "q2.adj_reserve", "q2.adj_comment", "q2.corrected_plan", + "q2.pay_date", "q2.pay_amount", "q2.pay_comment", "q2.pay_act", + "q2.booking", "q2.actual_m1", "q2.actual_m2", "q2.actual_m3", "q2.actual_quarter", + "q2.residual_after_booking", "q2.residual_after_actual", + "q2.transfer_q3", "q2.transfer_q3_delay_acts", "q2.transfer_q3_delay_procurement", + "q2.transfer_q3_economy_rf", "q2.transfer_next_comment", "q2.transfer_q4", + "q2.transfer_far_comment", "q2.transfer_econ", "q2.total", + "q3.target_change", "q3.base_correction", "q3.base_correction_comment", + "q3.revision_inc", "q3.revision_seq", "q3.revision_comment", "q3.new_plan", + "q3.adj_current", "q3.adj_ssp", "q3.adj_reserve", "q3.adj_comment", "q3.corrected_plan", + "q3.pay_date", "q3.pay_amount", "q3.pay_comment", "q3.pay_act", + "q3.booking", "q3.actual_m1", "q3.actual_m2", "q3.actual_m3", "q3.actual_quarter", + "q3.residual_after_booking", "q3.residual_after_actual", + "q3.transfer_q4", "q3.transfer_q4_delay_acts", "q3.transfer_q4_delay_procurement", + "q3.transfer_q4_economy_rf", "q3.transfer_next_comment", "q3.transfer_econ", "q3.total", + "q4.target_change", "q4.base_correction", "q4.base_correction_comment", + "q4.revision_inc", "q4.revision_seq", "q4.revision_comment", "q4.new_plan", + "q4.adj_current", "q4.adj_ssp", "q4.adj_reserve", "q4.adj_comment", "q4.corrected_plan", + "q4.pay_date", "q4.pay_amount", "q4.pay_comment", "q4.pay_act", + "q4.booking", "q4.actual_m1", "q4.actual_m2", "q4.actual_m3", "q4.actual_spod", "q4.actual_quarter", + "q4.residual_after_booking", "q4.residual_after_actual", "q4.transfer_econ", + "totals.fact_year", "totals.pay_year", +] + + +def test_form2_depth_columns_leaf_order_matches_screen_config(): + writer = XlsxDepthSheetWriter( + workbook=XlsxWorkbook(), + columns_dict=FORM2_DEPTH_COLUMNS, + row_normalizer=lambda row: row, + value_serializer=lambda value: value, + ) + assert writer.columns == EXPECTED_LEAF_ORDER + + +def test_form2_depth_columns_has_no_vsp_address(): + assert "header.vsp_address" not in EXPECTED_LEAF_ORDER + writer = XlsxDepthSheetWriter( + workbook=XlsxWorkbook(), + columns_dict=FORM2_DEPTH_COLUMNS, + row_normalizer=lambda row: row, + value_serializer=lambda value: value, + ) + assert "header.vsp_address" not in writer.columns + + +@pytest.mark.parametrize("sheet", ["OPER", "AHR", "CAP"]) +def test_form2_colors_cover_every_leaf(sheet): + missing = [key for key in EXPECTED_LEAF_ORDER if key not in FORM2_COLORS[sheet]] + assert missing == [] + + +def test_render_column_years_resolves_form2_top_group_names(): + rendered = render_column_years(FORM2_DEPTH_COLUMNS, 2026) + names = {node["name"] for node in rendered.values()} + assert "2026 год" in names + assert "2027 год" in names + assert "1 квартал 2026 года" in names + # Original templates are untouched (render_column_years deep-copies). + assert any("{year}" in node["name"] for node in FORM2_DEPTH_COLUMNS.values() if "{year}" in node.get("name", "")) + + +def test_create_xlsxwriter_sheet_writers_form2_uses_its_own_layout(): + service = ExportService(AsyncMock()) + workbook = XlsxWorkbook() + writers = service._create_xlsxwriter_sheet_writers(workbook, FormTypeEnum.FORM_2.value, 2026) + + for sheet in ("OPER", "AHR", "CAP"): + assert writers[sheet].columns == EXPECTED_LEAF_ORDER + + +def test_create_xlsxwriter_sheet_writers_form1_is_unaffected(): + service = ExportService(AsyncMock()) + workbook = XlsxWorkbook() + writers = service._create_xlsxwriter_sheet_writers(workbook, FormTypeEnum.FORM_1.value, 2026) + + form1_writer = XlsxDepthSheetWriter( + workbook=XlsxWorkbook(), + columns_dict=FORM1_DEPTH_COLUMNS, + row_normalizer=lambda row: row, + value_serializer=lambda value: value, + ) + assert writers["OPER"].columns == form1_writer.columns + assert writers["OPER"].columns != EXPECTED_LEAF_ORDER + + +def test_form2_row_normalizer_keeps_header_nesting(): + # В отличие от Form1DepthRowNormalizer, поля header.* НЕ поднимаются наверх: + # FORM2_DEPTH_COLUMNS ожидает их как header.section_code, header.vsp_id и т.д. + normalizer = Form2DepthRowNormalizer(ExcelValueSerializer()) + row = { + "header": {"section_code": "01", "vsp_id": 5}, + "plan": {"q1": 10}, + "q4": {"actual_spod": 1}, + "line_id": 999, + } + normalized = normalizer.normalize(row) + assert normalized["header.section_code"] == "01" + assert normalized["header.vsp_id"] == 5 + assert normalized["plan.q1"] == 10 + assert normalized["q4.actual_spod"] == 1 + assert "line_id" not in normalized + assert "header" not in normalized + + +@pytest.mark.asyncio +async def test_resolve_form2_vsp_numbers_replaces_id_with_registration_number(): + service = ExportService(AsyncMock()) + service.vsp_repo.get_reg_numbers_by_ids = AsyncMock(return_value={5: "1234/0001", 7: "5678/0002"}) + + rows = [ + ("INPUT", 1, 0, {"header": {"vsp_id": 5}, "plan": {"q1": 10}}), + ("INPUT", 1, 1, {"header": {"vsp_id": 7}, "plan": {"q1": 20}}), + ("GROUP", 0, 0, {"header": {"vsp_id": None}}), + ("META", 0, 0, None), + ] + + await service._resolve_form2_vsp_numbers(rows) + + assert rows[0][3]["header"]["vsp_id"] == "1234/0001" + assert rows[1][3]["header"]["vsp_id"] == "5678/0002" + assert rows[2][3]["header"]["vsp_id"] is None + service.vsp_repo.get_reg_numbers_by_ids.assert_awaited_once_with([5, 7]) + + +@pytest.mark.asyncio +async def test_resolve_form2_vsp_numbers_skips_db_call_when_no_vsp_ids(): + service = ExportService(AsyncMock()) + service.vsp_repo.get_reg_numbers_by_ids = AsyncMock(return_value={}) + + rows = [("INPUT", 1, 0, {"plan": {"q1": 10}})] + await service._resolve_form2_vsp_numbers(rows) + + service.vsp_repo.get_reg_numbers_by_ids.assert_not_awaited() diff --git a/web/src/components/RealtimeTable/constants/FORM_2/AHR.js b/web/src/components/RealtimeTable/constants/FORM_2/AHR.js index b4b34d7..3522269 100644 --- a/web/src/components/RealtimeTable/constants/FORM_2/AHR.js +++ b/web/src/components/RealtimeTable/constants/FORM_2/AHR.js @@ -681,10 +681,6 @@ export const config = { color_type: blueColumn, accessorKey: "data.totals.pay_year", }, - "data.header.vsp_address": { - color_type: greenColumn, - accessorKey: "data.header.vsp_address", - }, }, columns: [ { @@ -731,14 +727,6 @@ export const config = { filterFn: "contains", editType: "vsp_dropdown", }, - { - header: "Адрес ВСП", - accessorKey: "data.header.vsp_address", - columnLetter: "E1", - size: 220, - filterFn: "contains", - editType: "vsp_dropdown", - }, ], muiTableHeadCellProps: { sx: { diff --git a/web/src/components/RealtimeTable/constants/FORM_2/CAP.js b/web/src/components/RealtimeTable/constants/FORM_2/CAP.js index 9b8c833..0ac3baf 100644 --- a/web/src/components/RealtimeTable/constants/FORM_2/CAP.js +++ b/web/src/components/RealtimeTable/constants/FORM_2/CAP.js @@ -681,10 +681,6 @@ export const config = { color_type: blueColumn, accessorKey: "data.totals.pay_year", }, - "data.header.vsp_address": { - color_type: orangeColumn, - accessorKey: "data.header.vsp_address", - }, }, columns: [ { @@ -731,14 +727,6 @@ export const config = { filterFn: "contains", editType: "vsp_dropdown", }, - { - header: "Адрес ВСП", - accessorKey: "data.header.vsp_address", - columnLetter: "E1", - size: 220, - filterFn: "contains", - editType: "vsp_dropdown", - }, ], muiTableHeadCellProps: { sx: { diff --git a/web/src/components/RealtimeTable/constants/FORM_2/OPER.js b/web/src/components/RealtimeTable/constants/FORM_2/OPER.js index 623c5d7..de6e80b 100644 --- a/web/src/components/RealtimeTable/constants/FORM_2/OPER.js +++ b/web/src/components/RealtimeTable/constants/FORM_2/OPER.js @@ -681,10 +681,6 @@ export const config = { color_type: blueColumn, accessorKey: "data.totals.pay_year", }, - "data.header.vsp_address": { - color_type: blueColumn, - accessorKey: "data.header.vsp_address", - }, }, columns: [ { @@ -731,14 +727,6 @@ export const config = { filterFn: "contains", editType: "vsp_dropdown", }, - { - header: "Адрес ВСП", - accessorKey: "data.header.vsp_address", - columnLetter: "E1", - size: 220, - filterFn: "contains", - editType: "vsp_dropdown", - }, ], muiTableHeadCellProps: { sx: { diff --git a/web/src/components/Stages/constants.js b/web/src/components/Stages/constants.js index 1979f6b..c118adf 100644 --- a/web/src/components/Stages/constants.js +++ b/web/src/components/Stages/constants.js @@ -8,7 +8,6 @@ export const stageColumnsHiddenFromPicker = [ // 'data.header.name', 'data.header.internal_order', // 'data.header.vsp_id', - 'data.header.vsp_address', 'data.header.section_code', // 'data.header.justification', ];