From 9961405648b98155f9afd276fc73e9a5608968e4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Mar 2024 15:23:52 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/common/util/ValidUtil.java  | 14 +++++++++++++
 .../ITbMemberProjectSubitemService.java       | 20 +++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java
index f47c6578..2e88be7b 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java
@@ -139,4 +139,18 @@ public class ValidUtil {
         }
         return msg;
     }
+
+    /**
+     * 检查错误信息中是否有指定错误信息
+     */
+    public static boolean checkErrorList(List<String> errorList, String key){
+        boolean result = true;
+        for (String error : errorList) {
+            if (error.contains(key)){
+                result = false;
+            }
+        }
+        return result;
+    }
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index 0df8407f..c577f150 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -191,7 +191,8 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 			errorRowNum += 1;
 			TbMemberProjectSubitemExcelImport subitemExcel = (TbMemberProjectSubitemExcelImport) obj;
 			TbMemberProjectSubitem subitem = new TbMemberProjectSubitem();
-			errorMessage.addAll(ValidUtil.validateReturnListWithNum(subitemExcel,errorRowNum));
+			List<String> errorList = ValidUtil.validateReturnListWithNum(subitemExcel, errorRowNum);
+			errorMessage.addAll(errorList);
 
 			String companyName = subitemExcel.getCompanyId();
 			PayCompanyManagement companyManagement = companyManagementService.getCompanyByName(companyName);
@@ -241,17 +242,16 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 			}
 
 			//待确收金额
-			String amountReceivable = subitemExcel.getAmountReceivable();
-			subitem.setAmountReceivable(new BigDecimal(amountReceivable));
-
-			//预估到账日期
-			String estimatedArrivalDate = subitemExcel.getEstimatedArrivalDate();
-			try {
-				subitem.setEstimatedArrivalDate(DateUtil.parseDate(estimatedArrivalDate));
-			}catch (Exception e){
-				log.error("error",e);
+			if (ValidUtil.checkErrorList(errorList,"待确收金额")) {
+				String amountReceivable = subitemExcel.getAmountReceivable();
+				subitem.setAmountReceivable(new BigDecimal(amountReceivable));
 			}
 
+			//预估到账日期
+			if (ValidUtil.checkErrorList(errorList,"预估到账日期")) {
+				String estimatedArrivalDate = subitemExcel.getEstimatedArrivalDate();
+				subitem.setEstimatedArrivalDate(DateUtil.parseDate(estimatedArrivalDate));
+			}
 
 			String paymentMethod = subitemExcel.getPaymentMethod();
 			if (!paymentTypeMap.containsKey(paymentMethod)){