LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

普通项目变更

Browse Source
This commit is contained in:
梁琦涛
2021-09-16 11:22:22 +08:00
parent 76f8444f69
commit 3b13454148
10 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java
+3 -3
View File
@@ -160,9 +160,9 @@ public class PayIncomeContract implements Serializable {
@DecimalMax(value = "9999999999.99",message = "未收金额格式错误")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal outstandingAmount;
/**账款状态（1：未支付，2：部分支付，3：已付全款）*/
@Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15)
@ApiModelProperty(value = "账款状态（1：未支付，2：部分支付，3：已付全款）")
/**账款状态（1：待收款，2：部分收款，3：已收全款）*/
@Excel(name = "账款状态（1：待收款，2：部分收款，3：已收全款）", width = 15)
@ApiModelProperty(value = "账款状态（1：待收款，2：部分收款，3：已收全款）")
@Max(value = 3,message = "账款状态格式错误")
@Dict(dicCode = "revenue_contract_account_status")
private java.lang.Integer accountStatus;
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+1 -1
View File
@@ -517,7 +517,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}else{
paySpendingContract.setAccountStatus(PayIncomeContractCommon.ACCOUNT_STATUS1);
}
paySpendingContract.setNoTaxAmount(paySpendingContract.getContractAmount().subtract(paySpendingContract.getContractAmount().multiply(paySpendingContract.getRate().divide(new BigDecimal("100")))));
paySpendingContract.setNoTaxAmount(paySpendingContract.getContractAmount().divide(new BigDecimal("1").add(paySpendingContract.getRate().divide(new BigDecimal("100")))));
setPaySpendingContract(paySpendingContract);
paySpendingContractService.save(paySpendingContract);
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();