From cfb82f02e148d5fb77e7bc6bf675e502d69dcd41 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 29 Aug 2023 10:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/core/entity/TDxRecordInvoice.java    |  2 +-
 .../dxhy/core/model/ExceptionInvoiceVo.java   |  2 +-
 .../thread/CautionExportAnomalyThread.java    | 16 +++++++++++++
 .../mapper/DomesticRecordInvoiceMapper.xml    | 24 -------------------
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxRecordInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxRecordInvoice.java
index e42f6283..72e05dd1 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxRecordInvoice.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxRecordInvoice.java
@@ -434,7 +434,7 @@ public class TDxRecordInvoice implements Serializable {
     private String imageId;
     private String accountPeriod;
     private String compCode;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
     private String bzr;
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/ExceptionInvoiceVo.java b/dxhy-core/src/main/java/com/dxhy/core/model/ExceptionInvoiceVo.java
index 674d6db3..f166ac80 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/ExceptionInvoiceVo.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/ExceptionInvoiceVo.java
@@ -29,7 +29,7 @@ public class ExceptionInvoiceVo {
     private String imageId;
     private String accountPeriod;
     private String compCode;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
     private String bzr;
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java
index 55646440..f6aa1c2d 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CautionExportAnomalyThread.java
@@ -260,6 +260,22 @@ public class CautionExportAnomalyThread extends BaseThread {
             // 税额
             vo.setTaxAmount(MathUtil.round(record.getTaxAmount().toPlainString()));
 
+            vo.setSnVoucherNumber(record.getSnVoucherNumber());
+
+            vo.setPostingTime(record.getPostingTime());
+
+            vo.setImageId(record.getImageId());
+
+            vo.setAccountPeriod(record.getAccountPeriod());
+
+            vo.setCompCode(record.getCompCode());
+
+            vo.setInAccountStatus(record.getInAccountStatus());
+
+            vo.setBzdh(record.getBzdh());
+
+            vo.setBzr(record.getBzr());
+
             dataList.add(vo);
         }
 
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml
index 994fbdf5..266a8842 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml
@@ -1536,12 +1536,6 @@
         <if test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
             and t.invoice_no = #{invoiceNo}
         </if>
-        <if test="deptId != null and deptId != '' and deptId != 'null' and deptId != '99'">
-            and t.dept_id = #{deptId}
-        </if>
-        <if test="deptId == ''">
-            and t.dept_id is null
-        </if>
         <if test="sellerName != null and sellerName != '' and sellerName != 'null' ">
             and t.xf_name like concat(#{sellerName},'%')
         </if>
@@ -1604,12 +1598,6 @@
                 test="authenticationPeople != null and authenticationPeople != '' and authenticationPeople != 'null'">
             and t.gx_user_name like concat(#{authenticationPeople},'%')
         </if>
-        <if test="deptId != null and deptId != '' and deptId != 'null' and deptId != '99'">
-            and t.dept_id = #{deptId}
-        </if>
-        <if test="deptId == ''">
-            and t.dept_id is null
-        </if>
         <if test="currentPeriod != null and currentPeriod != '' and currentPeriod != 'null'">
             and t.rzh_belong_date = #{currentPeriod}
         </if>
@@ -1655,12 +1643,6 @@
         <if test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
             and t.invoice_no = #{invoiceNo}
         </if>
-        <if test="deptId != null and deptId != '' and deptId != 'null' and deptId != '99'">
-            and t.dept_id = #{deptId}
-        </if>
-        <if test="deptId == ''">
-            and t.dept_id is null
-        </if>
         <if test="sellerName != null and sellerName != '' and sellerName != 'null' ">
             and t.xf_name like concat(#{sellerName},'%')
         </if>
@@ -1724,12 +1706,6 @@
                 test="authenticationPeople != null and authenticationPeople != '' and authenticationPeople != 'null'">
             and t.gx_user_name like concat(#{authenticationPeople},'%')
         </if>
-        <if test="deptId != null and deptId != '' and deptId != 'null' and deptId != '99' ">
-            and t.dept_id = #{deptId}
-        </if>
-        <if test="deptId == ''">
-            and t.dept_id is null
-        </if>
         <if test="currentPeriod != null and currentPeriod != '' and currentPeriod != 'null'">
             and t.rzh_belong_date = #{currentPeriod}
         </if>