From 27a5198a0947e244cccd990e94b87d31f095e662 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 25 Apr 2023 10:13:24 +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

---
 .../com/dxhy/extend/entity/ExtAddTaxInvoice.java |  4 ++--
 .../service/pool/ExtInvoicePoolServiceImpl.java  |  2 +-
 .../resources/mapper/ExtInvoicePoolMapper.xml    | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java
index 0d4d94a7..2ff8e0db 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java
@@ -133,9 +133,9 @@ public class ExtAddTaxInvoice implements Serializable {
     private String collectDate;
     private String collectFrom;
 
-    private String voucherNumber;
+    private String snVoucherNumber;
     private String postingTime;
-    private String imageId;
+    private String imageNumber;
     private String accountPeriod;
     private String compCode;
 }
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
index ee251aa9..fdf47a99 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
@@ -290,7 +290,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
             String[] titleprop = {"xh", "invoiceType", "invoiceCode", "invoiceNo", "invoiceStatus", "invoiceDate",
                 "gfmc", "gfsh", "invoiceAmount", "taxAmount", "totalAmount", "listStatus", "remark", "incentiveFlag",
                 "collectStatus", "collectDate", "collectFrom", "qsfs", "systemName", "qszt", "qsrq", "qsr",
-                "inAccountMonth", "inAccountStatus", "voucherNumber", "documentNumber", "createDate","imageId","accountPeriod"
+                "inAccountMonth", "inAccountStatus", "snVoucherNumber", "documentNumber", "createDate","imageNumber","accountPeriod"
             ,"postingTime"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index 1462f47e..4b9da6a7 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -430,14 +430,14 @@
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
             and t.invoice_source = #{invoiceSource}
         </if>
-        <if test="voucherNumber != null and voucherNumber != '' and voucherNumber != 'null' and voucherNumber != '99'">
-            and t.voucher_number = #{voucherNumber}
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
         </if>
         <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
             and t.posting_time = #{postingTime}
         </if>
-        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
-            and t.image_id = #{imageId}
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
         </if>
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
@@ -450,8 +450,8 @@
         <include refid="sql_fields_added"/>
         ,t.incentive_flag incentiveFlag
         ,t.system_name systemName
-        ,t.voucher_no voucherNumber
-        ,t.image_id imageId
+        ,t.sn_voucher_number snVoucherNumber
+        ,t.image_id imageNumber
         ,t.account_period accountPeriod
         ,t.posting_time postingTime
         from t_dx_sale_record_invoice t
@@ -517,8 +517,8 @@
         <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
             and t.posting_time = #{postingTime}
         </if>
-        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
-            and t.image_id = #{imageId}
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
         </if>
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}