From bd6b8cef110b58170be478e60e5ad8b7f7530b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Tue, 31 Aug 2021 18:06:48 +0500 Subject: [PATCH] update api client --- src/services/api/models/CompanyDto.ts | 2 +- src/services/api/models/FileInfoDto.ts | 1 - src/services/api/models/UserDto.ts | 3 +++ src/services/api/services/FileService.ts | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/services/api/models/CompanyDto.ts b/src/services/api/models/CompanyDto.ts index fcd415a..e532790 100644 --- a/src/services/api/models/CompanyDto.ts +++ b/src/services/api/models/CompanyDto.ts @@ -5,5 +5,5 @@ export type CompanyDto = { id?: number; caption?: string | null; - companyType?: string | null; + companyTypeCaption?: string | null; } \ No newline at end of file diff --git a/src/services/api/models/FileInfoDto.ts b/src/services/api/models/FileInfoDto.ts index fecd900..c9cf4cd 100644 --- a/src/services/api/models/FileInfoDto.ts +++ b/src/services/api/models/FileInfoDto.ts @@ -13,5 +13,4 @@ export type FileInfoDto = { uploadDate?: string; size?: number; author?: UserDto; - company?: string | null; } \ No newline at end of file diff --git a/src/services/api/models/UserDto.ts b/src/services/api/models/UserDto.ts index b4d8f7c..8fad14a 100644 --- a/src/services/api/models/UserDto.ts +++ b/src/services/api/models/UserDto.ts @@ -2,6 +2,8 @@ /* tslint:disable */ /* eslint-disable */ +import type { CompanyDto } from './CompanyDto'; + export type UserDto = { login?: string | null; level?: number | null; @@ -12,4 +14,5 @@ export type UserDto = { idCompany?: number | null; idRole?: number | null; password?: string | null; + company?: CompanyDto; } \ No newline at end of file diff --git a/src/services/api/services/FileService.ts b/src/services/api/services/FileService.ts index cbee6bb..7d591b5 100644 --- a/src/services/api/services/FileService.ts +++ b/src/services/api/services/FileService.ts @@ -35,7 +35,7 @@ requestBody?: any, * Возвращает информацию о файлах для скважины в выбраной категории * @param idWell id скважины * @param idCategory id категории файла - * @param companies id компаний для фильтрации возвращаемых файлов + * @param companyName id компаний для фильтрации возвращаемых файлов * @param fileName часть имени файла для поиска * @param begin дата начала * @param end дата окончания @@ -47,7 +47,7 @@ requestBody?: any, public static async getFilesInfo( idWell: number, idCategory: number, -companies?: Array, +companyName?: string, fileName?: string, begin?: string, end?: string, @@ -59,7 +59,7 @@ take: number = 32, path: `/api/well/${idWell}/files`, query: { 'idCategory': idCategory, - 'companies': companies, + 'companyName': companyName, 'fileName': fileName, 'begin': begin, 'end': end,