From e915291dd7a98f3deaf1b6ddd61be0c7aff13c34 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 22 May 2023 19:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E5=B7=A5=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=9A=82=E6=8C=82=E5=8C=BA=E9=97=B4=E7=8E=B0=E5=AE=9E?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/base/controller/BaseInvoiceController.java    | 2 +-
 .../service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java | 1 +
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 9615c0d5..8a524706 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -480,7 +480,7 @@ public class BaseInvoiceController extends AbstractController {
         String bzdh = (String) map.get("bzdh");
         String inAccountStatus = (String) map.get("inAccountStatus");
         String companyCode = (String) map.get("companyCode");
-        String suspendStatus = (String) map.get("suspendStatus");
+        String suspendStatus = (String) map.get("suspendStastus");
         String suspendDate = (String) map.get("suspendDate");
         String bzr = (String) map.get("bzr");
         if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index 6797e3e8..4da59a73 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -211,6 +211,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     }else {
                         vo.setSuspendStatus("");
                     }
+                    vo.setSuspendDate(pageList.get(i).getSuspendDate());
                     vo.setBzr(pageList.get(i).getBzr());
                     vo.setPaymentStatus(dictdetaServcice.queryDictName(DictConstant.FK_STATUS,pageList.get(i).getPaymentStatus()));
                     vo.setPaymentDate(pageList.get(i).getPaymentDate());
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 90c8aa84..67a5c021 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -382,7 +382,7 @@
         from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno
         left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq
         WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq}
-        and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')
+        and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
         and t.rzh_yesorno = '0'
         and t.auth_status in('0','5','6')
         and t.export_mark = '0'