From 164124e13170a740b6dc6d4cb044a1461c3f9dc7 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 23 Apr 2023 11:14:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sign/service/fpqs/impl/SignFpqsServiceImpl.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
index 6b98c724..b1db6804 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
@@ -1501,7 +1501,11 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
             pramsMap.put("invoiceCode", invoiceCode);
             pramsMap.put("invoiceNo", invoiceNo);
             pramsMap.put("invoiceType", invoiceType);
-            pramsMap.put("invoiceDate", excelFp.getString("invoiceDate"));
+            if (excelFp.getString("invoiceDate") != null){
+                String invoiceDate = excelFp.getString("invoiceDate").substring(0, 10);
+                pramsMap.put("invoiceDate",invoiceDate);
+            }
+
             pramsMap.put("invoiceAmount", excelFp.getString("invoiceAmount"));
             pramsMap.put("checkCode", excelFp.getString("checkCode"));
 
@@ -1586,6 +1590,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
                         invoiceUtil.setJym(checkCode);
                         if (!invoiceUtil.jymValid()) {
                             msg = "校验码不正确";
+                            if (invoiceNo !=null && invoiceNo.length() == 20){
+                                msg = null;
+                            }
                         }
                     }
                 } else {
@@ -1598,6 +1605,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
                     invoiceUtil.setJym(checkCode);
                     if (!invoiceUtil.jymValid()) {
                         msg = "校验码不正确";
+                        if (invoiceNo !=null && invoiceNo.length() == 20){
+                            msg = null;
+                        }
                     }
                 }
             }