|
@@ -1280,14 +1280,43 @@ FROM
|
|
List<int> userIds = groupList.Select(it => it.JietuanOperatorId).ToList();
|
|
List<int> userIds = groupList.Select(it => it.JietuanOperatorId).ToList();
|
|
List<int> userIds1 = new List<int>() { 4, 21 };
|
|
List<int> userIds1 = new List<int>() { 4, 21 };
|
|
var userDepDatas = await _sqlSugar.Queryable<Sys_Users>()
|
|
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)
|
|
foreach (var item in groupList)
|
|
{
|
|
{
|
|
item.Department = userDepDatas.Find(it => item.JietuanOperatorId == it.UserId)?.DepName ?? "Unknown";
|
|
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
|
|
#endregion
|
|
|
|
|
|
@@ -7352,7 +7381,7 @@ FROM
|
|
|
|
|
|
int sign = (int)data.Data.GetType().GetProperty("sign").GetValue(data.Data, null);
|
|
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));
|
|
return Ok(JsonView(true, data.Msg, data.Data));
|
|
}
|
|
}
|