From d7f4f951045ee2df1a07521f42b8881390526fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 21 Oct 2021 09:28:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40965?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/common/PayIncomeContractCommon.java   |  2 +-
 .../impl/PaySpendingContractServiceImpl.java       | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
index e0409944..63d649a2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
@@ -80,7 +80,7 @@ public class PayIncomeContractCommon {
      */
     public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人",
             "部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点",
-            "应收金额","已收金额","未税金额","账款状态","合同约定付款次数","是否打包","打包年份");
+            "应收金额","已收金额","未收金额","账款状态","合同约定付款次数","是否打包","打包年份");
     /**
      * 支出合同分期信息excel 表头
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index 2aa7b62b..13eb2144 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -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)));
             }
         }