From c5305de933a68bb53bd34728d14a72fcf0118921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Fri, 1 Sep 2023 17:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E5=AE=A2=E7=A5=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8A=B5=E6=89=A3=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/core/service/export/impl/TicketServiceImpl.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java
index 2e0ebb2a..06c0e5be 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java
@@ -150,6 +150,9 @@ public class TicketServiceImpl extends MpBaseServiceImpl<TicketDao, TicketInvoic
                 dataArray[7] = resultList.get(i).getPassengerSfzh();
                 dataArray[8] = resultList.get(i).getTrainNumber();
                 dataArray[9] = AmountFormatUtil.fmtMicrometer(resultList.get(i).getInvoiceAmount());
+                if (StringUtils.isBlank(dataArray[9])){
+                    dataArray[9] = "0";
+                }
                 dataArray[10] = resultList.get(i).getTaxRate();
                 dataArray[11] = AmountFormatUtil.fmtMicrometer(resultList.get(i).getTaxAmount());
                 if ("1".equals(resultList.get(i).getQsStatus())) {
@@ -172,10 +175,9 @@ public class TicketServiceImpl extends MpBaseServiceImpl<TicketDao, TicketInvoic
 
                 }
                 dataArray[15] = resultList.get(i).getQsName();
-                if ("1".equals(resultList.get(i).getIsDeduction())) {
+                if ("Y".equals(resultList.get(i).getIsDeduction())) {
                     dataArray[16] = "不可抵扣";
-
-                } else if ("0".equals(resultList.get(i).getIsDeduction())) {
+                } else {
                     dataArray[16] = "可抵扣";
                 }
                 dataArray[17] = resultList.get(i).getBusinessDocumentNumber();