diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java index 6f96b5d3..4ebf905b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java @@ -30,7 +30,7 @@ public class GuaranteeLetterListResponse { @ApiModelProperty("贷审会同意时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date updateTime; + private Date passingTime; @ApiModelProperty("附件(会议记录)") private String file; @@ -53,11 +53,11 @@ public class GuaranteeLetterListResponse { @ApiModelProperty("金额") @ExcelProperty(value = "金额",index = 4) - private Double applyAmount; + private Double loanMoney; @ApiModelProperty("期限") @ExcelProperty(value = "期数",index = 5) - private String applyTime; + private String loanTern; @ApiModelProperty("申请日期") @ExcelProperty(value = "申请日期",index = 6) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java index cc48aee2..25ffafa9 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java @@ -46,11 +46,11 @@ public class LoanNoticeListResponse { @ApiModelProperty("金额") @ExcelProperty(value = "金额",index = 4) - private Double applyAmount; + private Double loanMoney; - @ApiModelProperty("期限") + @ApiModelProperty("期数") @ExcelProperty(value = "期数",index = 5) - private String applyTime; + private String loanTern; @ApiModelProperty("申请日期") @ExcelProperty(value = "申请日期",index = 6) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java index a156079f..13f4a00c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java @@ -30,7 +30,7 @@ public class PaymentConfirmationListResponse { @ApiModelProperty("贷审会同意时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date updateTime; + private Date passingTime; @ApiModelProperty("附件(会议记录)") private String file; @@ -53,11 +53,11 @@ public class PaymentConfirmationListResponse { @ApiModelProperty("金额") @ExcelProperty(value = "金额",index = 4) - private Double applyAmount; + private Double loanMoney; @ApiModelProperty("期限") @ExcelProperty(value = "期数",index = 5) - private String applyTime; + private String loanTern; @ApiModelProperty("申请日期") @ExcelProperty(value = "申请日期",index = 6) diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml index 406d2cb6..5bef8979 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml @@ -17,14 +17,14 @@ - + - - + + @@ -32,8 +32,8 @@ - select ln.id,aai.business_code,cc.name,cc.phone,aai.business_type,aai.apply_amount,aai.apply_time, + select ln.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_tern,lcc.loan_money, aai.create_time,ln.status,aai.bank,ln.audit_opinion,ln.operating_status,bps.business_status from dg_loan_notice ln left join dg_apply_amount_info aai on ln.business_id = aai.id left join crms_company_customer ccc on ln.company_id = ccc.id left join crms_customer cc on ccc.customer_id = cc.id + left join dg_loan_committee_consider lcc on ln.business_id = lcc.business_id left join dg_business_process_status bps on ln.business_id = bps.business_id AND ln.role_id = #{roleId} diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml index 9e3cd102..c176490c 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml @@ -18,14 +18,14 @@ - + - - + + @@ -33,8 +33,8 @@