From e12577e559072577de8a2d22f3d164fe1e711f40 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Fri, 4 Aug 2023 16:52:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E6=AC=BE=E4=B9=A6=E5=87=BA=E5=8F=A3?=
 =?UTF-8?q?=E8=BD=AC=E5=86=85=E9=94=80=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomsRecordDkrzServiceImpl.java    |  6 ++++
 .../resources/mapper/CustomsRecordMapper.xml  | 18 +++++++++--
 .../DomesticExportCustomsCkServiceImpl.java   | 17 +++++++++++
 .../DomesticExportInvoiceCkServiceImpl.java   | 17 +++++++++++
 .../mapper/DomesticExportCustomsMapper.xml    | 30 +++++++++++++++++--
 .../mapper/DomesticExportInvoiceMapper.xml    | 30 +++++++++++++++++--
 6 files changed, 109 insertions(+), 9 deletions(-)

diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
index 5eb3e5fe..fd0b8fb8 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
@@ -931,6 +931,12 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
 
                     map.put("bdkMessage", dictdetaServcice.queryDictName(DictConstant.bdkMessage, bdkMessage));
 
+                    if ("1".equals(map.get("inAccountStatus"))){
+                        map.put("inAccountStatus","已入账");
+                    }else {
+                        map.put("inAccountStatus","未入账");
+                    }
+
                     map.put("taxAmount", AmountFormatUtil.fmtMicrometer(MathUtil.round((String)map.get("taxAmount"))));
                     map.put("yxTaxAmount",
                         AmountFormatUtil.fmtMicrometer(MathUtil.round((String)map.get("yxTaxAmount"))));
diff --git a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
index bad4af07..d11c97fd 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
@@ -260,7 +260,9 @@
         p.image_id as imageNumber,
         p.account_period as accountPeriod,
         p.posting_time as postingTime,
-        p.sn_voucher_number as snVoucherNumber
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_customs_record p
         where
@@ -489,7 +491,15 @@
         p.dept_name as businessName,
         p.rzh_belong_date as rzhBelongDate,
         p.bdk_yy as bdkYy,
-        p.bdk_message as bdkMessage
+        p.bdk_message as bdkMessage,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_customs_record p
         where
@@ -858,7 +868,9 @@
         p.image_id as imageNumber,
         p.account_period as accountPeriod,
         p.posting_time as postingTime,
-        p.sn_voucher_number as snVoucherNumber
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_customs_record p
         where
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java
index 35b25128..14bf0117 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java
@@ -95,6 +95,12 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 }
                 map.put("dataSources", dictdetaServcice.queryDictName(DictConstant.JKSCJFS, dataSources));
 
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
+
                 if (map.get("exportTaxAmount") == null || "".equals(map.get("exportTaxAmount"))) {
                     map.put("exportTaxAmount", "0.00");
                 } else {
@@ -433,6 +439,12 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 map.put("cxbdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_UNDO_STATUS, cxbdkStatus));
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.BDK_AUTH_STATUS, authStatus));
 
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
+
                 if (map.get("exportTaxAmount") == null || "".equals(map.get("exportTaxAmount"))) {
                     map.put("exportTaxAmount", "0.00");
                 } else {
@@ -558,6 +570,11 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, authStatus));
                 map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));;
                 map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
                 map.put("bdkStatusBak", bdkStatus);
                 if (map.get("exportTaxAmount") == null || "".equals(map.get("exportTaxAmount"))) {
                     map.put("exportTaxAmount", "0.00");
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
index 8bdcc98e..2321fea7 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
@@ -97,6 +97,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                     map.put("invoiceDate", map.get("invoiceDate"));
                 }
                 map.put("invoiceStatus", dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceStatus));
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
 
                 map.put("exportAmount", AmountFormatUtil
                     .fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString())));
@@ -415,6 +420,12 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.BDK_AUTH_STATUS, authStatus));
                 map.put("cxbdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_UNDO_STATUS, cxbdkStatus));
 
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
+
                 map.put("exportAmount", AmountFormatUtil
                     .fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString())));
                 map.put("exportTaxAmount", AmountFormatUtil
@@ -536,6 +547,12 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
                 map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));
 
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
+
                 map.put("bdkStatusBak", bdkStatus);
 
                 map.put("exportAmount", AmountFormatUtil
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
index c44f864e..7c9e30cf 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
@@ -130,7 +130,15 @@
         p.export_no as exportNo,
         p.glzt as glzt,
         p.check_status as checkStatus,
-        p.entry_discrepancy as entryDiscrepancy
+        p.entry_discrepancy as entryDiscrepancy,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_customs p
         left join
@@ -249,7 +257,15 @@
         p.export_no as exportNo,
         p.cxbdk_status as cxbdkStatus,
         p.auth_status as authStatus,
-        p.bdk_status as bdkStatus
+        p.bdk_status as bdkStatus,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_customs p
         where
@@ -410,7 +426,15 @@
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
         p.cxrz_status as cxrzStatus,
-        p.cxbdk_status as cxbdkStatus
+        p.cxbdk_status as cxbdkStatus,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_customs p
         where
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
index aa6eb934..401f572b 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
@@ -115,7 +115,15 @@
         p.export_amount as exportAmount,
         p.export_tax_amount as exportTaxAmount,
         p.export_yxse as exportYxse,
-        p.gf_tax_no as gfTaxNo
+        p.gf_tax_no as gfTaxNo,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_invoice p
         where
@@ -187,7 +195,15 @@
         p.auth_status as authStatus,
         p.cxbdk_status as cxbdkStatus,
         p.bdk_status as bdkStatus,
-        p.gf_tax_no as gfTaxNo
+        p.gf_tax_no as gfTaxNo,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_invoice p
         where company = #{queryParams.company}
@@ -334,7 +350,15 @@
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
         p.cxbdk_status as cxbdkStatus,
-        p.cxrz_status as cxrzStatus
+        p.cxrz_status as cxrzStatus,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_invoice p
         where