From e12f01ca9933a7262ca9a1934074bf19aecdbe5b Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 5 Jul 2024 16:16:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E5=A3=AB=E5=9F=BA?= =?UTF-8?q?=E8=AE=A2=E8=88=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingMSKAPIService.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index adce569f..ac42a57c 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -351,7 +351,7 @@ namespace Myshipping.Application.Service.BookingOrder //ETD if (b.departureDateTime.HasValue) { - showDto.ETD = b.departureDateTime.Value; + leg.ETD = b.departureDateTime.Value; } else { @@ -361,7 +361,7 @@ namespace Myshipping.Application.Service.BookingOrder //ETA if (b.arrivalDateTime.HasValue) { - showDto.ETA = b.arrivalDateTime.Value; + leg.ETA = b.arrivalDateTime.Value; } else { @@ -1434,7 +1434,8 @@ namespace Myshipping.Application.Service.BookingOrder .WhereIF(jobEnd != DateTime.MinValue, t => t.JOB_TIME.HasValue && t.JOB_TIME.Value < jobEnd) .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TotalAmountStart), t => t.SHIP_RATE_TOTAL_AMOUNT != null && t.SHIP_RATE_TOTAL_AMOUNT.Value >= decimal.Parse(QuerySearch.TotalAmountStart)) .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TotalAmountEnd), t => t.SHIP_RATE_TOTAL_AMOUNT != null && t.SHIP_RATE_TOTAL_AMOUNT.Value <= decimal.Parse(QuerySearch.TotalAmountEnd)) - .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookingChannelType), t => t.SHIP_RATE_TOTAL_CURRENCY == QuerySearch.TotalCurrency) + .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookingChannelType), t => t.BOOKING_CHANNEL_TYPE == QuerySearch.BookingChannelType) + .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TotalCurrency), t => t.SHIP_RATE_TOTAL_CURRENCY == QuerySearch.TotalCurrency) .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.PriceReference), t => t.PRICE_REFERENCE.Contains(QuerySearch.PriceReference)) .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookedByCompanyName), t => t.BOOKEDBY_COMPANY_NAME.Contains(QuerySearch.BookedByCompanyName)) .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookedByCompanyPartyCode), t => t.BOOKEDBY_COMPANY_PARTYCODE.Contains(QuerySearch.BookedByCompanyPartyCode))