MCBFrontend/mcb-platform-monorepo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request #2513: fix(TEAMMSBMOB-22943): Исправление преобразования даты

Browse Source 
Merge in MCB_FE/mcb-platform-monorepo from fix/TEAMMSBMOB-22943 to release-1.10.2

* commit 'c7313f147dd32e9aa4affd0bebae3a7fcd7141ad':
  fix(TEAMMSBMOB-22943): Исправление преобразования даты
This commit is contained in:
Дмитрий Слабухин
2026-02-03 15:57:48 +03:00
parent b0dbaebdc1 c7313f147d
commit 71be8716f9
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/msb-statements-and-inquiries/src/widgets/StatementCreateForm/lib/utils.ts
+7 -6
View File
@@ -353,6 +353,11 @@ const mapStatementRequestFormToDto = (formValues: StatementForm, creationType: C
const { dateInterval, period } = dateWithPeriod || {};
const parsedDate = (dateInterval as string[]).map(date => date.split('T')[0]);
// Должно быть локальное время
const formattedDate = parsedDate.map(date => formatDateTime(date, { keepLocalTime: true, format: STATEMENT_REQUEST_DATE_FORMAT }));
return {
action,
accountsIds: accountIds,
@@ -367,12 +372,8 @@ const mapStatementRequestFormToDto = (formValues: StatementForm, creationType: C
: Boolean(separateDocumentsFiles),
},
creationType,
dateFrom: formatDateTime(dateInterval[0] as string | undefined, {
format: STATEMENT_REQUEST_DATE_FORMAT,
}),
dateTo: formatDateTime(dateInterval.length === 1 ? (dateInterval[0] as string | undefined) : (dateInterval[1] as string | undefined), {
format: STATEMENT_REQUEST_DATE_FORMAT,
}),
dateFrom: formattedDate[0],
dateTo: formattedDate[1],
format: action === STATEMENT_REQUEST_ACTION.VIEW ? STATEMENT_REQUEST_ACTION.VIEW : fileFormats,
hideEmptyTurnovers,
nationalCurrency,
services/msb-statements-and-inquiries/src/widgets/StatementCreateForm/ui/useStatementCreateForm.ts
+2 -2
View File
@@ -1,7 +1,7 @@
import { useCallback, useMemo } from 'react';
import type { StatementRequestFormDto } from '@msb/http/statements';
import { OPERATIONS, REPORT_TYPE_DTO, STATEMENT_REQUEST_FORMAT, STATEMENT_REQUEST_TYPES } from '@msb/http/statements';
import { MEDIA, PERIOD_TYPE, useMediaQuery } from '@msb/shared';
import { getIntervalByPeriod, MEDIA, PERIOD_TYPE, useMediaQuery } from '@msb/shared';
import dayjs from 'dayjs';
import { useHistory } from 'react-router-dom';
import { LOCALIZATION_ERRORS } from '../lib';
@@ -77,7 +77,7 @@ const initialValuesSlim: StatementForm = {
fileFormats: STATEMENT_REQUEST_FORMAT.PDF,
dateWithPeriod: {
period: PERIOD_TYPE.YESTERDAY,
dateInterval: [new Date().setDate(new Date().getDate() - 1)],
dateInterval: getIntervalByPeriod(PERIOD_TYPE.YESTERDAY)!,
},
reportType: REPORT_TYPE_DTO.STATEMENT_AND_DOCUMENTS,
};