|
|
@@ -334,21 +334,22 @@ namespace OASystem.Infrastructure.Repositories.Financial
|
|
|
{
|
|
|
JsonView result = new() { Code = 400,Msg="" };
|
|
|
|
|
|
- var groupInfoData = await _delegationRep.Query(x => x.IsDel == 0)
|
|
|
+ //var groupInfoData = await _delegationRep.GetGroupInfo(new GroupInfoDto() { Id = dto.DiId });
|
|
|
+ var groupInfoData = await _delegationRep.Query(x => x.Id == dto.DiId)
|
|
|
.Select(x => new
|
|
|
{
|
|
|
x.Id,
|
|
|
x.TeamName,
|
|
|
- x.VisitStartDate,
|
|
|
- x.VisitEndDate,
|
|
|
- x.VisitPNumber,
|
|
|
- x.VisitDays,
|
|
|
- x.VisitCountry,
|
|
|
x.TourCode,
|
|
|
- x.ClientName
|
|
|
+ x.ClientName,
|
|
|
+ VisitCountry = x.VisitCountry.Replace("|","、"),
|
|
|
+ x.VisitDays,
|
|
|
+ x.VisitPNumber,
|
|
|
+ x.VisitStartDate,
|
|
|
+ x.VisitEndDate
|
|
|
})
|
|
|
- .OrderByDescending(x => x.Id)
|
|
|
- .ToListAsync();
|
|
|
+ .FirstAsync();
|
|
|
+
|
|
|
|
|
|
//应收款项
|
|
|
string groupReceivedSql = string.Format(@"Select *,su.CnName As AuditorName From Fin_ForeignReceivables ffr
|
