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

完善金融认款修改报错

master
fanzongzhe 1 year ago
parent
07f361a7ea
commit
8faf7c7665
4 changed files with 7 additions and 47 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. 46
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java
  3. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
  4. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java

46
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -3582,7 +3582,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark());
}
String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesName());
String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesSid());
if (StringUtils.isNotBlank(noReturnMoney)) {
rsk.setNoReceivableMoney(noReturnMoney);
}
@ -3597,46 +3597,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
rsk.setAuditState(String.valueOf(v.getAuditState()));
rskList.add(rsk);
}
// finSelectedReceivablesDetailedVos.stream().forEach(v -> {
// 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<FinColl
rsk.setVin(data.getVinNo());
}
}
String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesName());
String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesSid());
if (StringUtils.isNotBlank(noReturnMoney)) {
rsk.setNoReceivable(new BigDecimal(noReturnMoney));
}
@ -4828,7 +4788,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
rsk.setVin(data.getVinNo());
}
}
String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesName());
String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid,v.getReceivablesSid());
if (StringUtils.isNotBlank(noReturnMoney)) {
rsk.setResidueMoney(new BigDecimal(noReturnMoney));
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java
View File

@ -80,7 +80,7 @@ public interface FinUncollectedReceivablesDetailedJRMapper extends BaseMapper<Fi
String selNoReturnMoneyRsk(@Param("planSid") String planSid);
String selNoReturnMoneyJR(@Param("planSid") String planSid,@Param("name") String name);
String selNoReturnMoneyJR(@Param("planSid") String planSid,@Param("sid") String sid);
List<AppFinUncollectedReceivablesDetailedRskVo> getRskPaymentDetailsListForRule( @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedRskVo> qw,
@Param("userOrgSid") String userOrgSid,

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
View File

@ -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
</select>
<select id="getRskPaymentDetailsListForRule"

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java
View File

@ -116,8 +116,8 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
return baseMapper.selNoReturnMoneyRsk(planSid);
}
public String selNoReturnMoneyJR(String planSid,String name) {
return baseMapper.selNoReturnMoneyJR(planSid,name);
public String selNoReturnMoneyJR(String planSid,String sid) {
return baseMapper.selNoReturnMoneyJR(planSid,sid);
}

Write Preview
Loading…
Cancel
Save