From 1650eca7e2d95e2e50d65e01cf0ca43e157c1983 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 25 Jul 2023 14:03:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectedReceivablesDetailedMapper.xml | 59 ++++++++++++++----- ...inUncollectedReceivablesDetailedMapper.xml | 7 ++- .../LoanTemplateSolutionsDto.java | 2 + 3 files changed, 52 insertions(+), 16 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 093fc81a75..4030e22ebd 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -50,9 +50,14 @@ d.receivablesSid, d.`collSid`, cast(( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance + d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) + + COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance FROM fin_selected_receivables_detailed d LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` + LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney + FROM fin_funds_carried_forward_apply fa + LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid + WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid WHERE (d.auditState = 1 OR d.auditState = 3) GROUP BY d.`sid`) d group by d.receivablesSid @@ -172,15 +177,22 @@ resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo"> select ifnull(sum(dbalance), 0) as subscriptionMoney from (SELECT d.sid, - d.receivablesSid, - d.`collSid`, - d.auditState, - cast(( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance - FROM fin_selected_receivables_detailed d - LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` - left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid - WHERE d.auditState = #{state} and ff.busVinSid = #{busVinSid} and d.contractNo = #{contractNo} + d.receivablesSid, + d.`collSid`, + d.auditState, + cast(( + d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) + + COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance + FROM fin_selected_receivables_detailed d + LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` + left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid + LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney + FROM fin_funds_carried_forward_apply fa + LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid + WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid + WHERE d.auditState = #{state} + and ff.busVinSid = #{busVinSid} + and d.contractNo = #{contractNo} GROUP BY d.`sid`) d @@ -296,11 +308,17 @@ d.`collSid`, d.auditState, cast(( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance + d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) + + COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance FROM fin_selected_receivables_detailed d LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid - WHERE d.auditState = 3 and ff.busVinSid = #{busVinSid} + LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney + FROM fin_funds_carried_forward_apply fa + LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid + WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid + WHERE d.auditState = 3 + and ff.busVinSid = #{busVinSid} GROUP BY d.`sid`) d @@ -466,9 +484,14 @@ d.receivablesSid, d.`collSid`, cast(( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance + d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) + + COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance FROM fin_selected_receivables_detailed d LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` + LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney + FROM fin_funds_carried_forward_apply fa + LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid + WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid WHERE (d.auditState = 1 OR d.auditState = 3) GROUP BY d.`sid`) d group by d.receivablesSid @@ -524,10 +547,16 @@ d.`collSid`, d.auditState, cast(( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance + d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) + + COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance FROM fin_selected_receivables_detailed d LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` + LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney + FROM fin_funds_carried_forward_apply fa + LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid + WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid WHERE d.auditState = 3 - GROUP BY d.`sid`) d WHERE d.receivablesSid = #{receivablesSid} + GROUP BY d.`sid`) d + WHERE d.receivablesSid = #{receivablesSid} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 7b35a8f02f..4cc514099c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -76,9 +76,14 @@ d.receivablesSid, d.`collSid`, cast(( - d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance + d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) + + COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance FROM fin_selected_receivables_detailed d LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid` + LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney + FROM fin_funds_carried_forward_apply fa + LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid + WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid WHERE (d.auditState = 1 OR d.auditState = 3) GROUP BY d.`sid`) d group by d.receivablesSid diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java index 68a50a815c..c4cfc3a855 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java @@ -62,6 +62,8 @@ public class LoanTemplateSolutionsDto implements Dto { @ApiModelProperty("厂家贴息") @NotBlank(message = "厂家贴息不能为空") private String factoryDiscount; + @ApiModelProperty("厂家贴息用途") + private String factoryDiscountUse; @ApiModelProperty("年利率") private String policyYearRatio;