From a48bccfc84500f260e8dabeafba63ec491600d55 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Mar 2024 10:18:52 +0800
Subject: [PATCH] =?UTF-8?q?fix=2083171=20=E4=BC=9A=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=AF=BC=E5=85=A5=E6=97=B6--=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E5=A2=9E=E5=8A=A0=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ITbMemberProjectSubitemService.java       | 78 ++++++++++---------
 .../vo/TbMemberProjectSubitemExcelImport.java |  1 +
 2 files changed, 44 insertions(+), 35 deletions(-)

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 351f8d2b..6c3a5e1a 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
@@ -213,46 +213,50 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 			errorMessage.addAll(errorList);
 
 			String companyName = subitemExcel.getCompanyId();
-			PayCompanyManagement companyManagement = companyManagementService.getCompanyByName(companyName);
-			if (companyManagement == null){
-				errorMessage.add("第" + errorRowNum + "行：" + "会员单位不存在");
-			}else if(companyNameList.contains(companyName)){
-				errorMessage.add("第" + errorRowNum + "行：" + "会员单位重复");
-			} else {
-				companyNameList.add(companyManagement.getCompanyName());
-				subitem.setCompanyName(companyManagement.getCompanyName());
-				subitem.setCompanyId(companyManagement.getId());
-			}
-			if (companyManagement != null){
-				String companyId = companyManagement.getId();
-				LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
-				wrapper.eq(TbMemberProjectSubitem::getProjectId, projectId);
-				wrapper.eq(TbMemberProjectSubitem::getCompanyId, companyId);
-				int count = this.count(wrapper);
-				if (count > 0) {
-					errorMessage.add("第" + errorRowNum + "行：" + "会员单位已经存在");
+			if (StringUtils.isNotBlank(companyName)){
+				PayCompanyManagement companyManagement = companyManagementService.getCompanyByName(companyName);
+				if (companyManagement == null){
+					errorMessage.add("第" + errorRowNum + "行：" + "会员单位不存在");
+				}else if(companyNameList.contains(companyName)){
+					errorMessage.add("第" + errorRowNum + "行：" + "会员单位重复");
+				} else {
+					companyNameList.add(companyManagement.getCompanyName());
+					subitem.setCompanyName(companyManagement.getCompanyName());
+					subitem.setCompanyId(companyManagement.getId());
 				}
+				if (companyManagement != null){
+					String companyId = companyManagement.getId();
+					LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
+					wrapper.eq(TbMemberProjectSubitem::getProjectId, projectId);
+					wrapper.eq(TbMemberProjectSubitem::getCompanyId, companyId);
+					int count = this.count(wrapper);
+					if (count > 0) {
+						errorMessage.add("第" + errorRowNum + "行：" + "会员单位已经存在");
+					}
 
-				String liaisonManId = subitemExcel.getLiaisonManId();
-				PayContactsManagement liaisonMan = payContactsManagementService.checkByCompanyIdAndName(liaisonManId, companyId);
-				if (liaisonMan == null){
-					errorMessage.add("第" + errorRowNum + "行：" + "企业联系人不存在");
-				}else {
-					subitem.setLiaisonManId(liaisonMan.getId());
-				}
+					String liaisonManId = subitemExcel.getLiaisonManId();
+					PayContactsManagement liaisonMan = payContactsManagementService.checkByCompanyIdAndName(liaisonManId, companyId);
+					if (liaisonMan == null){
+						errorMessage.add("第" + errorRowNum + "行：" + "企业联系人不存在");
+					}else {
+						subitem.setLiaisonManId(liaisonMan.getId());
+					}
 
-				String postContactId = subitemExcel.getPostContactId();
-				PayContactsManagement postContact = payContactsManagementService.checkByCompanyIdAndName(postContactId, companyId);
-				if (postContact == null){
-					errorMessage.add("第" + errorRowNum + "行：" + "邮寄联系人不存在");
-				}else {
-					subitem.setPostContactId(postContact.getId());
+					String postContactId = subitemExcel.getPostContactId();
+					PayContactsManagement postContact = payContactsManagementService.checkByCompanyIdAndName(postContactId, companyId);
+					if (postContact == null){
+						errorMessage.add("第" + errorRowNum + "行：" + "邮寄联系人不存在");
+					}else {
+						subitem.setPostContactId(postContact.getId());
+					}
 				}
 			}
 
 			//会员性质
 			String memberNature = subitemExcel.getMemberNature();
-			if (!memberNatureMap.containsKey(memberNature)){
+			if (StringUtils.isBlank(memberNature)){
+
+			}else if (!memberNatureMap.containsKey(memberNature)){
 				errorMessage.add("第" + errorRowNum + "行：" + "会员性质不存在");
 			}else {
 				int memberNatureInt = Integer.parseInt(memberNatureMap.get(memberNature));
@@ -272,7 +276,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 			}
 
 			String paymentMethod = subitemExcel.getPaymentMethod();
-			if (!paymentTypeMap.containsKey(paymentMethod)){
+			if (StringUtils.isBlank(paymentMethod)){
+
+			}else if (!paymentTypeMap.containsKey(paymentMethod)){
 				errorMessage.add("第" + errorRowNum + "行：" + "来款方式不存在");
 			}else {
 				int paymentMethodInt = Integer.parseInt(paymentTypeMap.get(paymentMethod));
@@ -288,7 +294,7 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 					queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,subitemExcel.getCompanyId());
 					List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
 					if(CollectionUtils.isEmpty(listPayIncomeContract)){
-						errorMessage.add("第" + errorRowNum + "行:合同号不存在");
+						errorMessage.add("第" + errorRowNum + "行：" + "合同号不存在");
 					}
 				}
 				if (Objects.equals(paymentMethodInt, PayProjectCommon.CHARGE_WAY3)) {
@@ -298,7 +304,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 				}
 			}
 			String invoiceRequirements = subitemExcel.getInvoiceRequirements();
-			if (!invoiceTypeMap.containsKey(invoiceRequirements)){
+			if (StringUtils.isBlank(invoiceRequirements)){
+
+			}else if (!invoiceTypeMap.containsKey(invoiceRequirements)){
 				errorMessage.add("第" + errorRowNum + "行：" + "需要发票不存在");
 			}else {
 				int invoiceRequirementsInt = Integer.parseInt(invoiceTypeMap.get(invoiceRequirements));
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java
index 536b4c82..738175d8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java
@@ -76,6 +76,7 @@ public class TbMemberProjectSubitemExcelImport {
 
     /**缴费方式*/
     @Excel(name = "来款方式", width = 15)
+    @NotBlank(message = "来款方式不能为空")
     @Dict(dicCode = "payment_type")
     private String paymentMethod;