From f1d383358bfe6f37194b9a878bfb5ac36c80f8a6 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 20:07:43 +0800
Subject: [PATCH] =?UTF-8?q?uuid=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/base/model/BaseSggxCxRespVO.java    | 1 +
 .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java    | 1 +
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml   | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
index ee54d389..085f0547 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
@@ -165,4 +165,5 @@ public class BaseSggxCxRespVO {
 
     private String bzr;
 
+    private String uuid;
 }
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 24e58d08..a96e9bcc 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
@@ -601,6 +601,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
         String businessName = this.getBusinessName(businessCode, businessList);
 
 //                        log.info("businessName={}",businessName);
+        vo.setUuid(baseTDxRecordInvoice.getUuid());
         vo.setVoucherNumber(baseTDxRecordInvoice.getVoucherNumber());
         vo.setSnVoucherNumber(baseTDxRecordInvoice.getSnVoucherNumber());
         vo.setImageNumber(baseTDxRecordInvoice.getImageNumber());
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 5e35a52a..4e52fd77 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1411,12 +1411,11 @@
             </if>
 
             ORDER BY tax_amount
-            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'N'.toString()">
-                limit #{curr},#{size}
-            </if>
-
         ) AS subquery
         WHERE  <![CDATA[ max_tax <= #{maxTax} ]]>
+        <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'N'.toString()">
+            limit #{curr},#{size}
+        </if>
 
     </select>