Ver código fonte

添加代办费属性并优化标题查找逻辑

在 `GroupsController.cs` 文件中,新增 `PettyBusinessAgencyFee` 和 `GrandBusinessAgencyFee` 属性,用于表示小公务代办费和大公务代办费。同时,修改了查找 `titleModel` 的逻辑,使用新的表达式 `expr` 以支持不区分大小写的比较。
Lyyyi 3 semanas atrás
pai
commit
6551352ccd

+ 6 - 2
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -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);