From c389f213d520f760fba7e6bd382bbb358e643de0 Mon Sep 17 00:00:00 2001 From: alina <1449359159@qq.com> Date: Fri, 24 Feb 2023 17:22:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A0=90=E5=AE=9A=E6=99=82=E9=96=93=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EasyBL.WEBAPP/ShowEasy/OnsiteService.cs | 22 ++++--------------- .../ViewModels/View_SAL_BookingOnline.cs | 4 ++++ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs index f20dcda..b2f3597 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs @@ -1199,27 +1199,13 @@ namespace EasyBL.WEBAPP.ShowEasy .Select((t1) => new View_SAL_BookingOnline { BookingID = SqlFunc.GetSelfAndAutoFill(t1.BookingID), - //ServiceID = t1.ServiceID, - //ServiceNo = t1.ServiceNo, - //ServiceName = t1.ServiceName, - //ConfirmDays = t2.ArgumentValue, - //ExhibitionID = t1.ExhibitionID, - //CancelPolicy = t1.CancelPolicy, - //Features = t1.Features, - //Details = t1.Details, - //MinPrice = t1.MinPrice, - //CurrencyID = t1.CurrencyID, - //ExpenseDescription = "" }).Single(); - - if (objBookingOnline != null) { - - - //ServicePictrue - - var objFiles = db.Queryable((t1, t2) => + if (objBookingOnline.BookingDate!=null) { + objBookingOnline.BookingDateFormat = Convert.ToDateTime(objBookingOnline.BookingDate).ToString("yyyy/MM/dd HH:mm"); + } + var objFiles = db.Queryable((t1, t2) => new object[] { JoinType.Inner, t1.OrgID == t2.OrgID && t1.ParentID == t2.PreviewFile && t2.ServiceID==objBookingOnline.ServiceID && t2.LangID==objBookingOnline.LangType diff --git a/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs b/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs index fc14f6e..dd3802c 100644 --- a/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs +++ b/EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs @@ -11,6 +11,10 @@ namespace Entity.ViewModels public string SupplierName { get; set; } public string ServiceName { get; set; } public string ServicePictrue { get; set; } + public string BookingDateFormat { get; set; } + + + //public string MemberName { get; set; } //public string MemberName { get; set; } }