yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
dimengzhe 2 years ago
parent
9f813c5ae7
commit
1650eca7e2
3 changed files with 52 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  2. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  3. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java

59
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -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
</select>
@ -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
</select>
@ -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}
</select>
</mapper>

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -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

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java
View File

@ -62,6 +62,8 @@ public class LoanTemplateSolutionsDto implements Dto {
@ApiModelProperty("厂家贴息")
@NotBlank(message = "厂家贴息不能为空")
private String factoryDiscount;
@ApiModelProperty("厂家贴息用途")
private String factoryDiscountUse;
@ApiModelProperty("年利率")
private String policyYearRatio;

Write Preview
Loading…
Cancel
Save