|
@@ -16440,7 +16440,8 @@ FROM
|
|
|
IsElectronicSignature = x.IsElectronicSignature == 1 ? "否" : "是", //电子签
|
|
|
IsVisaOnArrival = x.IsVisaOnArrival == 1 ? "否" : "是", //落地签
|
|
|
x.VisaTime, // 一般签证时间
|
|
|
-
|
|
|
+ x.PettyBusinessAgencyFee, //小公务代办费
|
|
|
+ x.GrandBusinessAgencyFee //大公务代办费
|
|
|
}).ToList(),
|
|
|
baoPi = _GroupCostParameterRepository.GetBaoPi(diid),
|
|
|
blackCodeIsTrue = _sqlSugar.Queryable<Air_TicketBlackCode>().Where(x => x.IsDel == 0 && x.DiId == diid).Any(), //create.Code == 0 ? true : false,
|
|
@@ -18011,7 +18012,10 @@ FROM
|
|
|
|
|
|
foreach (var item in dataSourceKeys)
|
|
|
{
|
|
|
- var find = dto.titleModel.FirstOrDefault(x => x.label.Replace(" ", "").Replace("/", "") == item);
|
|
|
+ Func<TitleModel, bool> expr = x => x.label.Replace(" ", "").Replace("/", "") == item
|
|
|
+ || x.label.Replace(" ", "").Replace("/", "").ToUpper() == item.ToUpper();
|
|
|
+
|
|
|
+ var find = dto.titleModel.FirstOrDefault(expr);
|
|
|
if (find != null)
|
|
|
{
|
|
|
designer.SetDataSource(item, find.text);
|