汇款账单-团组人员解密

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -32,6 +32,7 @@ using static OASystem.API.OAMethodLib.JWTHelper;
 using Org.BouncyCastle.Asn1.Ocsp;
 using OASystem.API.OAMethodLib.APNs;
 using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
+using OASystem.Domain.AesEncryption;
 
 namespace OASystem.API.Controllers
 {
@@ -1082,12 +1083,13 @@ namespace OASystem.API.Controllers
                                                   .LeftJoin<Crm_DeleClient>((tcl, dc) => tcl.ClientId == dc.Id && dc.IsDel == 0)
                                                   .LeftJoin<Crm_CustomerCompany>((tcl, dc, cc) => dc.CrmCompanyId == cc.Id && dc.IsDel == 0)
                                                   .Where((tcl, dc, cc) => tcl.IsDel == 0 && tcl.DiId == dto.DiId)
-                                                  .Select((tcl, dc, cc) => new
+                                                  .Select((tcl, dc, cc) => new ClientAirInfo
                                                   {
-                                                      Name = dc.LastName + dc.FirstName,
+                                                      LastName = dc.LastName,
+                                                      FirstName = dc.FirstName,
                                                       Sex = dc.Sex,
                                                       Birthday = dc.BirthDay,
-                                                      Company = cc.CompanyFullName.Replace("\n", ""),
+                                                      Company = cc.CompanyFullName,
                                                       Job = dc.Job,
                                                       AirType = tcl.ShippingSpaceTypeId
                                                   })
@@ -1096,6 +1098,13 @@ namespace OASystem.API.Controllers
                     {
                         return Ok(JsonView(false, "暂无团组成员,请先填写团组成员！！！"));
                     }
+
+                    foreach (var item in DeleClientList)
+                    {
+                        EncryptionProcessor.DecryptProperties(item);
+                        item.Company = item.Company.Replace("\n", "");
+                    }
+
                     var _ClientNames = DeleClientList.Select(x => x.Name).ToList();
                     var _GroupClient = DeleClientList.GroupBy(x => x.Company).ToList();
 

OASystem/OASystem.Domain/Dtos/Groups/TourClientListDto.cs

@@ -368,4 +368,9 @@ namespace OASystem.Domain.Dtos.Groups
         [Encrypted]
         public string Job { get; set; }
     }
+
+    public class ClientAirInfo: ClientInfo
+    {
+        public int AirType { get; set; }
+    }
 }