From 0729922103ba5399a9b254eb6c6acc8922ca9278 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 22 May 2025 09:59:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepurchaseApply.java | 4 ---- .../LoanRepurchaseApplyDetailsVo.java | 6 +----- .../LoanRepurchaseApplyDto.java | 4 ---- .../LoanRepurchaseCompanyCostVo.java | 2 +- .../loansettleapply/LoanSettleApplyMapper.xml | 20 +++++++++---------- 5 files changed, 12 insertions(+), 24 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApply.java index b3685fef22..7e4913614c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApply.java @@ -78,10 +78,6 @@ public class LoanRepurchaseApply extends BaseEntity { private String orgSidPath; @ApiModelProperty("回购原因") private String buybacksReason; - @ApiModelProperty("资方收款账户") - private String bankReceivingAccount; - @ApiModelProperty("资方收款账号") - private String bankAccountNo; @ApiModelProperty("付款时需备注内容") private String payRemarks; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java index 4fa300206a..cc6e4208ae 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java @@ -30,7 +30,7 @@ public class LoanRepurchaseApplyDetailsVo implements Vo { private String taskId; @ApiModelProperty("实例id") private String instanceId; - // private LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo(); + // private LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo(); //主体 @ApiModelProperty("申请日期") private String applyDate; @@ -75,10 +75,6 @@ public class LoanRepurchaseApplyDetailsVo implements Vo { private String amount; @ApiModelProperty("回购原因") private String buybacksReason; - @ApiModelProperty("资方收款账户") - private String bankReceivingAccount; - @ApiModelProperty("资方收款账号") - private String bankAccountNo; @ApiModelProperty("付款后需备注内容") private String payRemarks; private List buyfiles = new ArrayList<>(); // 回购情况附件 diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDto.java index 6d8fd7c402..94787fe4d5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDto.java @@ -70,10 +70,6 @@ public class LoanRepurchaseApplyDto implements Dto { private String amount; @ApiModelProperty("回购原因") private String buybacksReason; - @ApiModelProperty("资方收款账户") - private String bankReceivingAccount; - @ApiModelProperty("资方收款账号") - private String bankAccountNo; @ApiModelProperty("付款后需备注内容") private String payRemarks; private List buyfiles = new ArrayList<>(); // 回购情况附件 diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseCompanyCostVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseCompanyCostVo.java index c55ffb1992..90718bbbdc 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseCompanyCostVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseCompanyCostVo.java @@ -23,7 +23,7 @@ public class LoanRepurchaseCompanyCostVo { private String bankOverInterest; @ApiModelProperty("公司当期未到期月还") private String companyCurrentNotPrice; - @ApiModelProperty("资方未到期金额") + @ApiModelProperty("公司未到期金额") private String bankNotPrice; @ApiModelProperty("贷款保证金扣罚金额") private String deductionAmount; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml index 2eb65d4bb0..2aaf04272d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml @@ -21,7 +21,7 @@ select ifnull(sum(ss.yq_total), 0) - from (SELECT (lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))) AS yq_total - FROM `loan_repayment_plan_details` lrpd - LEFT JOIN `loan_repayment_history` lrh ON lrh.planDetailSid = lrpd.`sid` + from (SELECT (lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))) AS yq_total + FROM loan_repayment_plan_details lrpd + LEFT JOIN loan_repayment_history lrh ON lrh.planDetailSid = lrpd.sid WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{settingDate} - AND lrpd.`busVinSid` = #{busVinSid} - GROUP BY lrpd.`sid`) ss + AND lrpd.busVinSid = #{busVinSid} + GROUP BY lrpd.sid) ss @@ -196,13 +196,13 @@ FROM ( FROM ( SELECT - lrpd.`dueMoney`, + lrpd.dueMoney, lrpd.sid FROM loan_repayment_plan_details lrpd WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') > DATE_FORMAT(LAST_DAY(#{settingDate}), '%Y-%m-%d') - AND lrpd.`busVinSid` = #{busVinSid} + AND lrpd.busVinSid = #{busVinSid} ) a) b