diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java
index dbaa65c..401cec0 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java
@@ -108,6 +108,12 @@ public class InstallmentHistory extends BaseEntity
@Excel(name = "计算利率")
private String calculateInterestRate;
+
+ /** 收款账户 */
+ @ApiModelProperty(value="收款账户)")
+ @NotNull(message="收款账户")
+ @Excel(name = "收款账户")
+ private Long receivingAccountId;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -133,6 +139,7 @@ public class InstallmentHistory extends BaseEntity
.append("remark", getRemark())
.append("balance", getBalance())
.append("calculateInterestRate", getCalculateInterestRate())
+ .append("receivingAccountId", getReceivingAccountId())
.toString();
}
}
diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java
index e43fbf4..c39fb38 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java
@@ -43,4 +43,5 @@ public class InstallmentHistoryDto extends BaseEntity implements Serializable
@ApiModelProperty(value="开始月份")
private String startMonth;
+
}
diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java
index 448a751..b6f2bb5 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java
@@ -1,9 +1,9 @@
package com.ruoyi.invest.domain.vo;
import com.ruoyi.invest.domain.InstallmentHistory;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import io.swagger.annotations.ApiModel;
import java.util.Date;
@@ -39,4 +39,12 @@ public class InstallmentHistoryVo extends InstallmentHistory
@ApiModelProperty(value="借款天数")
private String loanDays;
+ /** 收款账户 */
+ @ApiModelProperty(value="收款账户名称")
+ private String receivingAccountName;
+
+ @ApiModelProperty(value="收款账户卡号")
+ private String receivingAccountCode;
+
+
}
diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
index e32d898..505313b 100644
--- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
+++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
@@ -28,10 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
@@ -44,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.installment_amount,
a.installment_date,
a.period,
+ a.receiving_account_id,
a.calculate_interest_rate,
(
select
@@ -107,11 +111,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.del_flag,
a.remark,
bc."name" as bank_name,
- bc.code as bank_code
+ bc.code as bank_code,
+ debit."name" as receiving_account_name,
+ debit.code as receiving_account_code
from
installment_history a
left join bank_card_lend bc on
bc.id = a.bank_card_lend_id
+ left join bank_card_lend debit on
+ debit.id = a.receiving_account_id