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

修改bug#40965

Browse Source
This commit is contained in:
梁琦涛
2021-10-21 09:28:46 +08:00
parent defe688ad5
commit d7f4f95104
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class PayIncomeContractCommon {
*/
public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人",
"部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点",
"应收金额","已收金额","未税金额","账款状态","合同约定付款次数","是否打包","打包年份");
"应收金额","已收金额","未收金额","账款状态","合同约定付款次数","是否打包","打包年份");
/**
* 支出合同分期信息excel 表头
*/
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+9 -5
View File
@@ -456,9 +456,13 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
if(!Objects.isNull(paySpendingContract.getPack()) && Objects.equals(paySpendingContract.getPack(),PayIncomeContractCommon.PACK1) && StringUtils.isBlank(paySpendingContract.getPackYear())){
sb.append("第").append(n + 1).append("行:打包年份不能为空，请修改！<br/>");
}
if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())
&& paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
sb.append("第").append(n + 1).append("行:已收金额大于应收金额，请修改！<br/>");
if(!Objects.isNull(paySpendingContract.getAccountsReceivableAmount()) && !Objects.isNull(paySpendingContract.getAmountReceived())){
if(paySpendingContract.getAccountsReceivableAmount().compareTo(paySpendingContract.getAmountReceived()) < 0){
sb.append("第").append(n + 1).append("行:已收金额大于应收金额，请修改！<br/>");
}
// if(Objects.isNull(paySpendingContract.getOutstandingAmount()) && paySpendingContract.getAccountsReceivableAmount().subtract(paySpendingContract.getAmountReceived()).compareTo(paySpendingContract.getOutstandingAmount()) > 0){
// sb.append("第").append(n + 1).append("行:已收金额大于应收金额，请修改！<br/>");
// }
}
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
@@ -596,9 +600,9 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
if(!StringUtils.isBlank(map.get(15))){
if(!pattern.matcher(map.get(15)).matches()){
sb.append("第").append(n).append("行:未税金额格式错误！<br/>");
sb.append("第").append(n).append("行:未收金额格式错误！<br/>");
}else{
paySpendingContract.setNoTaxAmount(new BigDecimal(map.get(15)));
paySpendingContract.setOutstandingAmount(new BigDecimal(map.get(15)));
}
}