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

OASystem/OASystem.Domain/Dtos/Groups/AirTicketResDto.cs

@@ -9,14 +9,14 @@ namespace OASystem.Domain.Dtos.Groups
     /// <summary>
     /// 根据登录用户查询
     /// </summary>
-    public class AirTicketResDto:DtoBase
+    public class AirTicketResDto : DtoBase
     {
         public int DiId { get; set; } = 0;
         public int UserId { get; set; } = 0;
         public int IsPaySign { get; set; } = -1;
 
     }
-   public class ItineraryAirTicketResDto
+    public class ItineraryAirTicketResDto
     {
         public int DiId { get; set; } = 0;
         public int UserId { get; set; } = 0;
@@ -27,7 +27,7 @@ namespace OASystem.Domain.Dtos.Groups
     /// </summary>
     public class AirTicketResDeriveDto
     {
-       
+
         public int CreateUserId { get; set; } = 0;
     }
     public class AirTicketResByIdDto
@@ -62,7 +62,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int Id { get; set; }
 
-        public int DiId { get;set; }
+        public int DiId { get; set; }
         /// <summary>
         /// 舱类型
         /// </summary>
@@ -91,7 +91,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 客人名称
         /// </summary>
-        public string ClientName { get; set; }
+        public List<int> ClientName { get; set; }
         /// <summary>
         /// 是否值机
         /// </summary>

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

@@ -414,25 +414,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 BeginTran();
                 int id = 0;
                 var grp_AirTicket = _mapper.Map<Grp_AirTicketReservations>(dto.AirTicketResOpData);
+                var clientName = string.Join(",", dto.AirTicketResOpData.ClientName);
 
                 if (dto.Status == 1)
                 {
-                    //string selectSql = string.Format(@"select * from Grp_AirTicketReservations where CONVERT(nvarchar,ClientName)= '{0}' and IsDel={1} and FlightsCode='{2}'"
-                    //                                 , dto.AirTicketResOpData.ClientName, 0,dto.AirTicketResOpData.FlightsCode);
-                    //var DeleClient = await _sqlSugar.SqlQueryable<Grp_AirTicketReservations>(selectSql).FirstAsync();//查询是否存在
-                    //if (DeleClient != null)
-                    //{
-                    //    return result = new Result() { Code = -1, Msg = "该机票信息已存在，请勿重复添加！" };
-                    //}
-                    //else//不存在，可添加
-                    //{
-                    //grp_AirTicket.ArrivedTime = "";
-                    //grp_AirTicket.LeaveDescription = "";
-                    //grp_AirTicket.FlightsDescription = "";
-                    //grp_AirTicket.DeleteUserId = 0;
-                    //grp_AirTicket.DeleteTime = "";
-                    //grp_AirTicket.ReturnDescription = "";
                     grp_AirTicket.FlightsDate = DateTime.Parse(grp_AirTicket.FlightsDate).ToString("yyyy-MM-dd");
+                    grp_AirTicket.ClientName = clientName;
                     id = await AddAsyncReturnId(grp_AirTicket);
                     if (id == 0)
                     {
@@ -631,7 +618,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 else if (dto.Status == 2)
                 {
                     id = dto.AirTicketResOpData.Id;
-
                     bool res = await UpdateAsync(a => a.Id == dto.AirTicketResOpData.Id, a => new Grp_AirTicketReservations
                     {
                         CType = dto.AirTicketResOpData.CType,
@@ -640,7 +626,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         Price = dto.AirTicketResOpData.Price,
                         Currency = dto.AirTicketResOpData.Currency,
                         ClientNum = dto.AirTicketResOpData.ClientNum,
-                        ClientName = dto.AirTicketResOpData.ClientName,
+                        ClientName = clientName,
                         IsCheckIn = dto.AirTicketResOpData.IsCheckIn,
                         IsSetSeat = dto.AirTicketResOpData.IsSetSeat,
                         IsPackage = dto.AirTicketResOpData.IsPackage,
@@ -930,7 +916,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
         public async Task<List<TranslateResult>> ReTransBatch(List<string> list, string aimlanguage)
         {
 
-           var reultStr = new List<TranslateResult>();
+            var reultStr = new List<TranslateResult>();
             if (list.Count < 0)
             {
                 return reultStr;
@@ -950,7 +936,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 Qtext = Qtext[..^1];
             }
 
-           var dic = new Dictionary<string, string>();
+            var dic = new Dictionary<string, string>();
 
             string url = "https://openapi.youdao.com/v2/api";
 
@@ -994,7 +980,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 return reultStr;
             }
         }
-        public  string Processing(string str)//处理这段英文的方法
+        public string Processing(string str)//处理这段英文的方法
         {
             if (string.IsNullOrEmpty(str)) { return ""; }