团组报表

机票费用 客户名字调整 计算费用

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -624,6 +624,8 @@ namespace OASystem.API.Controllers
                         decimal unitCost = 0.00M;
                         unitCost = (item.PayMoney / item.ClientNum).ConvertToDecimal1();
 
+                        Regex r = new Regex("[0-9]");
+                        item.ClientName = r.Replace(item.ClientName,"");
                         string[] clientNames = item.ClientName.Split('.');
                         for (int i = 0; i < item.ClientNum; i++)
                         {
@@ -633,19 +635,31 @@ namespace OASystem.API.Controllers
                                 int index = i + 1;
                                 if (index < clientNames.Length)
                                 {
-                                    name = clientNames[index].Replace("MR","").Replace("MS","");
-                                    if (name.Length > 0)
+                                    name = clientNames[index].Replace("MR","").Replace("MS","").Trim();
+                                    if (!string.IsNullOrEmpty(name))
                                     {
-                                        string nameLastStr = name[name.Length - 1].ToString();
-                                        if (nameLastStr.IsNumeric())
+                                        airClientPris.Add(new
                                         {
-                                            name = name.Substring(0, name.Length - 1).Trim();
-                                        }
+                                            CnName = name,
+                                            EnName = name,
+                                            Price = unitCost,
+                                            AirType = item.AirTypeName
+                                        });
                                     }
+                                    
+
+                                    //if (name.Length > 0)
+                                    //{
+                                    //    string nameLastStr = name[name.Length - 1].ToString();
+                                    //    if (nameLastStr.IsNumeric())
+                                    //    {
+                                    //        name = name.Substring(0, name.Length - 1).Trim();
+                                    //    }
+                                    //}
                                 }
                             }
                             
-                            clientPinYinName += string.Format(@"{0}.{1}出票价为：{2} CNY;", Index+1, name, unitCost);
+                            clientPinYinName += string.Format(@"{0}.{1}出票价为：{2} CNY;", Index+1, name, unitCost.ToString("#0.00"));
                         }
                     }
                     if (!string.IsNullOrEmpty(item.AuditGMDate))