diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index f3aad57a06..1d13d2b060 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3582,7 +3582,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService { -// FinSelectedReceivablesDetailedRsk rsk = new FinSelectedReceivablesDetailedRsk(); -// String receivablesSid = v.getReceivablesSid(); -// if (v.getReceivablesName().equals("月还")) { -// LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(receivablesSid).getData(); -// if (null != data) { -// BeanUtil.copyProperties(data, rsk, "sid"); -// if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) { -// rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark()); -// } -// String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyRsk(receivablesSid); -// if (StringUtils.isNotBlank(noReturnMoney)) { -// rsk.setNoReceivableMoney(noReturnMoney); -// } -// } -// } else { -// FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(receivablesSid); -// if (jr != null) { -// String busSid = jr.getBusSid(); -// LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(busSid).getData(); -// if (null != data) { -// BeanUtil.copyProperties(data, rsk, "sid"); -// if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) { -// rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark()); -// } -// String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid); -// if (StringUtils.isNotBlank(noReturnMoney)) { -// rsk.setNoReceivableMoney(noReturnMoney); -// } -// } -// } -// } -// rsk.setCurrentReceivableMoney(v.getCurrentReceivableMoney()); -// rsk.setReceivablesName(v.getReceivablesName()); -// rsk.setSid(v.getSid()); -// rsk.setSubscriptionMoney(v.getSubscriptionMoney()); -// rsk.setReceivablesSid(v.getReceivablesSid()); -// rsk.setAuditState(String.valueOf(v.getAuditState())); -// rskList.add(rsk); -// }); } finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(rskList); if (finCollectionConfirmation.getAuditState() == 2) { @@ -4590,7 +4550,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService getRskPaymentDetailsListForRule( @Param(Constants.WRAPPER) QueryWrapper qw, @Param("userOrgSid") String userOrgSid, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml index d7adf49b1c..e5b9b950f5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml @@ -263,7 +263,7 @@ LEFT JOIN anrui_riskcenter.loan_repayment_plan_details AS p ON jr.busSid = p.sid WHERE p.sid = #{planSid} - AND jr.payCostTitleValue = #{name}) as a + AND jr.sid = #{sid}) as a