From a055d8475c1e46bd25d1719a8e7e6766f88be063 Mon Sep 17 00:00:00 2001 From: Janie <109517022+Janie06@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:47:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=82=B3Remittance=20Image=20Name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs | 4 ++++ EuroTran/Entity/ShowEasyDtos/PaymentDTO.cs | 3 +++ 2 files changed, 7 insertions(+) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs index 5a40203..2eb4e43 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs @@ -754,6 +754,7 @@ namespace EasyBL.WEBAPP.SYS FileMaintain_QryService fm_qry = new FileMaintain_QryService(); var ImageDic = fm_qry.FindAllImageURLAsDic(""); + var AllFileDic = fm_qry.FindAllByIDsAsDictionary(""); PaymentMaintain_QryService pm_qry = new PaymentMaintain_QryService(); var PaymentDic = pm_qry.FindAllByIDsAsDictionary("", sBookingID); @@ -891,10 +892,13 @@ namespace EasyBL.WEBAPP.SYS if (ImageDic.ContainsKey(Payment.Remittance)) { rsPayment.Remittance = ImageDic[Payment.Remittance]; + rsPayment.RemittanceFileName = AllFileDic.Values.Where(w => w.ParentID == Payment.Remittance).Select(s => s.FileName).FirstOrDefault(); } } + + if (!string.IsNullOrEmpty(Payment.CurrencyID)) { CurrencyDTO PaymentCurrency = new CurrencyDTO(); diff --git a/EuroTran/Entity/ShowEasyDtos/PaymentDTO.cs b/EuroTran/Entity/ShowEasyDtos/PaymentDTO.cs index 21a02ba..1938cf0 100644 --- a/EuroTran/Entity/ShowEasyDtos/PaymentDTO.cs +++ b/EuroTran/Entity/ShowEasyDtos/PaymentDTO.cs @@ -20,6 +20,9 @@ namespace Entity.ShowEasyDtos public string Memo { get; set; } public string Remittance { get; set; } + public string RemittanceFileName { get; set; } + + public List RemittanceImg { get; set; } } }