Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Domain/Entities/Groups/Grp_AirTicketReservations.cs

@@ -99,12 +99,12 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 客人名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string ClientName { get; set; }
         /// <summary>
         /// 出票前报价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
         public decimal PrePrice { get; set; }
         /// <summary>
         /// 出票前报价币种
@@ -114,7 +114,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 机票全价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
         public decimal Price { get; set; }
         /// <summary>
         /// 币种

OASystem/OASystem.Domain/Entities/Resource/Air_TicketBlackCode.cs

@@ -45,7 +45,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 公务舱单价
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(12,2)")]
         public decimal BCPrice { get; set; }
         /// <summary>
         ///经济舱单价

OASystem/OASystem.Infrastructure/Repositories/Groups/AirTicketResRepository.cs

@@ -234,17 +234,30 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                   string [] ClientArr=  _AirTicketReservations[i].ClientName.Split(',').Where(x=>!string.IsNullOrWhiteSpace(x)).ToArray();
                     
+
+
                     foreach (var item in ClientArr)
                     {
-                        if (item == "-1")
+                        bool isNumeric = int.TryParse(item, out _);
+
+                        if (isNumeric)
                         {
-                            _AirTicketReservations[i].ClientNameStr += "行程单,";
+                            if (item == "-1")
+                            {
+                                _AirTicketReservations[i].ClientNameStr += "行程单,";
+                            }
+                            else
+                            {
+                                Crm_DeleClient DeleClient = _sqlSugar.Queryable<Crm_DeleClient>().Where(a => a.IsDel == 0 && a.Id == int.Parse(item)).First();
+                                _AirTicketReservations[i].ClientNameStr += DeleClient.Pinyin + ',';
+                            }
                         }
                         else
                         {
-                            Crm_DeleClient DeleClient = _sqlSugar.Queryable<Crm_DeleClient>().Where(a => a.IsDel == 0 && a.Id == int.Parse(item)).First();
-                            _AirTicketReservations[i].ClientNameStr += DeleClient.Pinyin + ',';
+                            _AirTicketReservations[i].ClientNameStr += item;
                         }
+
+                        
                     }
                     if (_AirTicketReservations[i].ClientNameStr is not null)
                     {