From fea487e98642cfaf01dfc182b4adec5d0082c4d0 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 14 Jul 2023 16:54:14 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=92=20CompanyTypeDto=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=202=20=D1=81=D0=B2?= =?UTF-8?q?=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=B0=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=82=D0=BE=D0=B3=D0=BE,=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20?= =?UTF-8?q?=D0=B2=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=BA=D0=B5=20=D0=B1?= =?UTF-8?q?=D1=8B=D0=BB=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BF=D0=BE=D1=80?= =?UTF-8?q?=D1=8F=D0=B4=D0=BE=D0=BA=20=D0=B8=20=D0=BC=D0=B5=D1=82=D0=BA?= =?UTF-8?q?=D1=83=20"=D1=8F=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=BC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/CompanyTypeDto.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/AsbCloudApp/Data/CompanyTypeDto.cs b/AsbCloudApp/Data/CompanyTypeDto.cs index 1e46787a..58901f85 100644 --- a/AsbCloudApp/Data/CompanyTypeDto.cs +++ b/AsbCloudApp/Data/CompanyTypeDto.cs @@ -13,5 +13,15 @@ /// public string Caption { get; set; } = null!; + /// + /// Порядок + /// + public int Order { get; set; } + + /// + /// Является ли контактом + /// + public bool IsContact { get; set; } + } } From fcd303c37a49691bda2eade1b7eaaa8530bcd92f Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Mon, 17 Jul 2023 09:49:06 +0500 Subject: [PATCH 2/2] =?UTF-8?q?WellOperationRequestBase.=20=D0=9E=D1=82?= =?UTF-8?q?=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=A1=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D1=82=D0=BA=D0=B8=D0=BD=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Requests/WellOperationRequest.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/AsbCloudApp/Requests/WellOperationRequest.cs b/AsbCloudApp/Requests/WellOperationRequest.cs index 63c31c18..ab5b901e 100644 --- a/AsbCloudApp/Requests/WellOperationRequest.cs +++ b/AsbCloudApp/Requests/WellOperationRequest.cs @@ -19,15 +19,15 @@ namespace AsbCloudApp.Requests public DateTime? LtDate { get; set; } /// - /// фильтр по максимальной глубине скважины - /// - public double? LeDepth { get; set; } - - /// - /// фильтр по минимальной глубине скважины + /// фильтр. Больше или равно глубины скважины на начало операции. /// public double? GeDepth { get; set; } + /// + /// фильтр. Меньше или равно глубины скважины на конец операции. + /// + public double? LeDepth { get; set; } + /// /// фильтр по списку id категорий операции ///