|
|
@@ -144,6 +144,7 @@ public class ContractInfoDao extends BaseDao<ContractInfoMapper, ContractInfo> {
|
|
|
PaymentRequestsDetailTable prd = PaymentRequestsDetailTable.prd;
|
|
|
PaymentRequestsTable pr = PaymentRequestsTable.pr;
|
|
|
PaymentRemitTable pre = PaymentRemitTable.payment_remit;
|
|
|
+ ContractInfoTable ci = ContractInfoTable.ci;
|
|
|
|
|
|
// 请款
|
|
|
TempTable t = sql()
|
|
|
@@ -173,7 +174,7 @@ public class ContractInfoDao extends BaseDao<ContractInfoMapper, ContractInfo> {
|
|
|
.select(
|
|
|
ct.tradingTime.as(TransactionVo::getTradingTime),
|
|
|
column("2").as(TransactionVo::getType),
|
|
|
- ct.amount.as(TransactionVo::getTradingAmount),
|
|
|
+ ct.amount.multiply(ci.exchangeRate).as(TransactionVo::getTradingAmount),
|
|
|
ct.remark.as(TransactionVo::getRemark),
|
|
|
ca.depositBank.as(TransactionVo::getDepositBank),
|
|
|
ca.accountName.as(TransactionVo::getAccountName),
|
|
|
@@ -183,6 +184,7 @@ public class ContractInfoDao extends BaseDao<ContractInfoMapper, ContractInfo> {
|
|
|
ct.targetAccount.as(TransactionVo::getTargetAccount)
|
|
|
)
|
|
|
.from(ct)
|
|
|
+ .innerJoin(ci).on(ct.contractId.eq(ci.id))
|
|
|
.leftJoin(ca).on(ct.capitalAccountId.eq(ca.id))
|
|
|
.where(
|
|
|
ct.contractId.eq(id),
|
24282