Sfoglia il codice sorgente

新增客户信息处理及汇率记录保存逻辑

在 `GroupsController.cs` 中,添加了用户部门数据查询,新增 `ClientInfoInfo_Group` 类以存储客户信息,并实现客户姓名解密逻辑。修改了汇率记录保存的参数。

在 `TourClientListDto.cs` 中,新增 `ClientInfoInfo_Group` 类,包含 `DiId` 和 `CreateTime` 属性。

在 `DelegationInfoView.cs` 中,新增 `GroupFirst` 属性以存储组的首个客户姓名信息。
LEIYI 2 mesi fa
parent
commit
7b11f26e00

+ 34 - 5
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1280,14 +1280,43 @@ FROM
             List<int> userIds = groupList.Select(it => it.JietuanOperatorId).ToList();
             List<int> userIds1 = new List<int>() { 4, 21 };
             var userDepDatas = await _sqlSugar.Queryable<Sys_Users>()
-                                              .LeftJoin<Sys_Department>((u, d) => u.DepId == d.Id)
-                                              .Where(u => u.IsDel == 0 && userIds.Contains(u.Id))
-                                              .Select((u, d) => new { UserId = u.Id, DepName = userIds1.Contains(u.Id) ? "国交部" : d.DepName })
-                                              .ToListAsync();
+                .LeftJoin<Sys_Department>((u, d) => u.DepId == d.Id)
+                .Where(u => u.IsDel == 0 && userIds.Contains(u.Id))
+                .Select((u, d) => new { UserId = u.Id, DepName = userIds1.Contains(u.Id) ? "国交部" : d.DepName })
+                .ToListAsync();
+
+            var droupIds = groupList.Select(it => it.Id).ToList();
+
+            var deleClientList = _sqlSugar.Queryable<Grp_TourClientList>()
+                .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 && droupIds.Contains(tcl.DiId))
+                .Select((tcl, dc, cc) => new ClientInfoInfo_Group
+                {
+                    DiId = tcl.DiId,
+                    LastName = dc.LastName,
+                    FirstName = dc.FirstName,
+                    Sex = dc.Sex,
+                    Birthday = dc.BirthDay,
+                    Company = cc.CompanyFullName,
+                    Job = dc.Job,
+                    CreateTime = tcl.CreateTime,
+                })
+                .ToList();
 
             foreach (var item in groupList)
             {
                 item.Department = userDepDatas.Find(it => item.JietuanOperatorId == it.UserId)?.DepName ?? "Unknown";
+
+                string groupFirstName = "";
+                var currDatas = deleClientList.Where(x => x.DiId == item.Id).ToList();
+                if (currDatas.Any())
+                {
+                    groupFirstName = AesEncryptionHelper.Decrypt(currDatas[0].LastName) + AesEncryptionHelper.Decrypt(currDatas[0].FirstName);
+                }
+
+
+                item.GroupFirst = groupFirstName;
             }
             #endregion
 
@@ -7352,7 +7381,7 @@ FROM
 
             int sign = (int)data.Data.GetType().GetProperty("sign").GetValue(data.Data, null);
             //汇率信息记录
-            await GeneralMethod.RateRecordSave(dto.UserId, sign, "出入境费用-草稿");
+            await GeneralMethod.RateRecordSave(dto.UserId, sign, "出入境费用");
 
             return Ok(JsonView(true, data.Msg, data.Data));
         }

+ 7 - 0
OASystem/OASystem.Domain/Dtos/Groups/TourClientListDto.cs

@@ -369,6 +369,13 @@ namespace OASystem.Domain.Dtos.Groups
         public string Job { get; set; }
     }
 
+    public class ClientInfoInfo_Group : ClientInfo
+    {
+        public int DiId { get; set; }
+        public DateTime CreateTime { get; set; }
+    }
+
+
     public class ClientAirInfo: ClientInfo
     {
         public int AirType { get; set; }

+ 2 - 0
OASystem/OASystem.Domain/ViewModels/Groups/DelegationInfoView.cs

@@ -496,6 +496,8 @@ namespace OASystem.Domain.ViewModels.Groups
         public int GrpScheduleId { get; set; } = 0;
 
         public DateTime CreateTime { get; set; }
+
+        public string GroupFirst { get; set; }
     }