Browse Source

修改问题

master
dimengzhe 2 years ago
parent
commit
2f8a76fae8
  1. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -241,7 +241,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//是否有余额
if (StringUtils.isNotBlank(record.getBalance())) {
//余额是0
if (new BigDecimal(record.getBalance()).compareTo(BigDecimal.ZERO) == 0) {
if (new BigDecimal(record.getBalance()).compareTo(BigDecimal.ZERO) <= 0) {
record.setShowHandle(false);
} else {
//是否是待审核状态或已驳回状态
@ -721,7 +721,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
BigDecimal balance = record.getBalance();//余额
//审核状态:1待审核/2已驳回/3已审核
if (balance != null) {
if (balance.compareTo(BigDecimal.ZERO) == 0) {
if (balance.compareTo(BigDecimal.ZERO) <= 0) {
record.setShowHandle(false);
record.setShowDelete(false);
} else {
@ -1869,7 +1869,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//查询该申请所有的款项明细
finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 3);
//与收款金额作比较:更新认款状态 1未认款/2部分认款/3已认款
confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) == 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2);
confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) <= 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2);
//更新收款申请的余额以及审核状态
BigDecimal balanceBigDecimal = confirmation.getCollectionMoney().subtract(subscriptionMoneyAll);
confirmation.setBalance(balanceBigDecimal);

Loading…
Cancel
Save