|
|
@ -886,10 +886,12 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
rsPayment.DueDate = Payment.DueDate; |
|
|
|
rsPayment.PaymentDate = Payment.PaymentDate; |
|
|
|
|
|
|
|
if (ImageDic.ContainsKey(Payment.Remittance)) |
|
|
|
{ |
|
|
|
if (!string.IsNullOrEmpty(Payment.Remittance)) { |
|
|
|
|
|
|
|
rsPayment.Remittance = ImageDic[Payment.Remittance]; |
|
|
|
if (ImageDic.ContainsKey(Payment.Remittance)) |
|
|
|
{ |
|
|
|
rsPayment.Remittance = ImageDic[Payment.Remittance]; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
@ -980,7 +982,8 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
string sAccount, |
|
|
|
List<string> SubCategoryIDs, |
|
|
|
List<string> BookingStatus, |
|
|
|
List<string> PaymentStatus) |
|
|
|
List<string> PaymentStatus, |
|
|
|
string Query) |
|
|
|
{ |
|
|
|
|
|
|
|
if (string.IsNullOrEmpty(sLanguageID)) |
|
|
@ -1005,6 +1008,10 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
BookingDic = FilterDTOByPaymentStatus(BookingDic, PaymentStatus); |
|
|
|
} |
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(Query)) { |
|
|
|
BookingDic = FilterByQuery(BookingDic, Query); |
|
|
|
} |
|
|
|
|
|
|
|
return BookingDic; |
|
|
|
|
|
|
|
} |
|
|
@ -1169,6 +1176,83 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
return rsBookingDic; |
|
|
|
} |
|
|
|
|
|
|
|
public Dictionary<string, BookingDTO> FilterByQuery(Dictionary<string, BookingDTO> BookingDic, string Query) |
|
|
|
{ |
|
|
|
|
|
|
|
Dictionary<string, BookingDTO> rsBookingDic = new Dictionary<string, BookingDTO>(); |
|
|
|
|
|
|
|
var rsBookingList = BookingDic.Values.ToList(); |
|
|
|
|
|
|
|
foreach (var Booking in rsBookingList) |
|
|
|
{ |
|
|
|
|
|
|
|
// Filter by BookingNo
|
|
|
|
if (!string.IsNullOrEmpty(Booking.BookingNo)) |
|
|
|
{ |
|
|
|
|
|
|
|
if (Booking.BookingNo.Contains(Query)) |
|
|
|
{ |
|
|
|
rsBookingDic[Booking.BookingID] = Booking; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// Filter by OnSiteService
|
|
|
|
if (Booking.OnSiteService != null) { |
|
|
|
|
|
|
|
var OnSiteService = Booking.OnSiteService; |
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(OnSiteService.ServiceName)) { |
|
|
|
|
|
|
|
if (OnSiteService.ServiceName.Contains(Query)) |
|
|
|
{ |
|
|
|
rsBookingDic[Booking.BookingID] = Booking; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// Filter by BookingDetail
|
|
|
|
if (Booking.BookingDetail.Count > 0) { |
|
|
|
|
|
|
|
foreach (var item in Booking.BookingDetail) { |
|
|
|
|
|
|
|
if (item.Contains(Query)) { |
|
|
|
rsBookingDic[Booking.BookingID] = Booking; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// Filter by OtherDetail
|
|
|
|
if (Booking.OtherDetail.Count > 0) |
|
|
|
{ |
|
|
|
|
|
|
|
if (Booking.OtherDetail.Contains(Query)) |
|
|
|
{ |
|
|
|
rsBookingDic[Booking.BookingID] = Booking; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// Filter by NoticeDetail
|
|
|
|
if (!string.IsNullOrEmpty(Booking.NoticeDetail)) |
|
|
|
{ |
|
|
|
|
|
|
|
if (Booking.NoticeDetail.Contains(Query)) |
|
|
|
{ |
|
|
|
rsBookingDic[Booking.BookingID] = Booking; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return rsBookingDic; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |