From 81827eab0823b7417bde55ed1265f604db53264f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 26 Oct 2021 16:55:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041475=20=E8=B5=84=E6=96=99=E7=BD=91?=
 =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE--=E4=BC=9A=E5=91=98=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE--=E5=AF=BC=E5=85=A5--=E5=AF=BC=E5=85=A5=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMemberProjectSubitemController.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
index 914ebf5c..398db4c2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
@@ -227,7 +227,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             //应收金额
             String amountReceivable = projectSubitemExcel.getAmountReceivable();
             if (!NumberUtil.isNumber(amountReceivable)) {
-                errorMessage.add("第" + errorRowNum + "行：应收金额不符合规范");
+                errorMessage.add("第" + errorRowNum + "行：应收金额格式错误");
             } else {
                 projectSubitem.setAmountReceivable(new BigDecimal(amountReceivable));
             }
@@ -235,7 +235,9 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
             Map<String, String> paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
             String paymentMethod = projectSubitemExcel.getPaymentMethod();
-            if (paymentTypeMap.containsKey(paymentMethod)) {
+            if (StringUtils.isBlank(paymentMethod)){
+                errorMessage.add("第" + errorRowNum + "行：来款方式不能为空");
+            }else if (paymentTypeMap.containsKey(paymentMethod)) {
                 projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod)));
             } else {
                 errorMessage.add("第" + errorRowNum + "行：来款方式不符合规范");
@@ -244,7 +246,9 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
             List<DictModel> invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type");
             Map<String, String> invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
             String needInvoice = projectSubitemExcel.getNeedInvoice();
-            if (invoiceTypeMap.containsKey(needInvoice)) {
+            if (StringUtils.isBlank(needInvoice)){
+                errorMessage.add("第" + errorRowNum + "行：需要发票不能为空");
+            }else if (invoiceTypeMap.containsKey(needInvoice)) {
                 projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice)));
             } else {
                 errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");