|
|
@@ -5799,7 +5799,6 @@ Group by PriceType ", dto.diId);
|
|
|
return Ok(jw);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
var _groupDatas = _sqlSugar.Queryable<Grp_DelegationInfo>()
|
|
|
.Where(x => x.IsDel == 0 &&
|
|
|
x.VisitDate >= _beginDt &&
|
|
|
@@ -6013,7 +6012,7 @@ Group by PriceType ", dto.diId);
|
|
|
RowNumber = rouNumber,
|
|
|
Applicant = userDatas.Find(it => it.Id == payInfo.CreateUserId)?.CnName ?? "",
|
|
|
ApplicantDt = payInfo.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
|
|
- PayType = setDatas.Find(it => it.Id == payInfo.PayDId)?.Name ?? "",
|
|
|
+ PayType = setDatas.Find(it => it.Id == hotelContent.PayDId)?.Name ?? "",
|
|
|
TransferMark = orbitalPrivateTransfer,
|
|
|
PriceName = subPriceName,
|
|
|
ModuleName = setDatas.Find(it => it.Id == payInfo.CTable)?.Name ?? "",
|
|
|
@@ -6032,7 +6031,6 @@ Group by PriceType ", dto.diId);
|
|
|
}
|
|
|
|
|
|
childList.AddRange(childInfos);
|
|
|
-
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -6067,7 +6065,7 @@ Group by PriceType ", dto.diId);
|
|
|
string remaksDescription = $"【{childInfo.PayType}】【{childInfo.ModuleName}】{rouNumber}、[申请人：{childInfo.Applicant}]{priName}[收款方：{childInfo.Payee}] {childInfo.PayCurrCode} {_PaymentAmount.ToString("#0.00")}、CNY：{childInfo.CNYSubTotalAmount.ToString("#0.00")}(团组：{groupInfo.TeamName})";
|
|
|
|
|
|
childInfo.RemaksDescription = remaksDescription;
|
|
|
- childList.Add(childInfo);
|
|
|
+ //childList.Add(childInfo);
|
|
|
rouNumber++;
|
|
|
}
|
|
|
}
|
