From c2216bf8e5ce722234009a516a9b6cb688ea8d08 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 5 Jun 2023 17:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=86=99=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseInvoiceManualCheckServiceImpl.java    | 63 ++++++++++---------
 .../resources/mapper/BaseSggxcxMapper.xml     |  6 +-
 2 files changed, 38 insertions(+), 31 deletions(-)

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 6f62fe4d..4c80b9eb 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
@@ -486,39 +486,42 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                 }
             }
 
+            int curr = (int) pramsMap.get("curr");
+            int size = (int) pramsMap.get("size");
+
+            String hjsl = "0";
+            String hjje = "0";
+            String hjse = "0";
+            List<BaseTDxRecordInvoice> hjList = super.baseMapper.selectChooseHj(pramsMap);
+            BaseTDxRecordInvoice hjxx = hjList.get(0);
+            hjsl = hjxx.getSfygx();
+            if (!"0".equals(hjsl)) {
+                hjje = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getInvoiceAmount().toPlainString()));
+                hjse = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getTaxAmount().toPlainString()));
+            }
+            json.put("hjsl", AmountFormatUtil.fmtMicrometer(hjsl));
+            json.put("hjje", hjje);
+            json.put("hjse", hjse);
+            if ("0".equals(hjsl)) {
+                json.put("message", "无可操作的数据");
+                json.put("code", "501");
+                return super.responseResult(json);
+            }
 
-            String isChooseAll = (String) pramsMap.get("isChooseAll");
-
-
-            //如果不是勾选所有进行统计和分页
-            if ("N".equalsIgnoreCase(isChooseAll)){
-                int curr = (int) pramsMap.get("curr");
-                int size = (int) pramsMap.get("size");
-
-                // 合计信息,仅第一页时需要统计，减少数据库压力
-                if (curr == 1) {
-                    String hjsl = "0";
-                    String hjje = "0";
-                    String hjse = "0";
-                    List<BaseTDxRecordInvoice> hjList = super.baseMapper.selectChooseHj(pramsMap);
-                    BaseTDxRecordInvoice hjxx = hjList.get(0);
-                    hjsl = hjxx.getSfygx();
-                    if (!"0".equals(hjsl)) {
-                        hjje = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getInvoiceAmount().toPlainString()));
-                        hjse = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getTaxAmount().toPlainString()));
-                    }
-                    json.put("hjsl", AmountFormatUtil.fmtMicrometer(hjsl));
-                    json.put("hjje", hjje);
-                    json.put("hjse", hjse);
-                    if ("0".equals(hjsl)) {
-                        json.put("message", "无可操作的数据");
-                        json.put("code", "501");
-                        return super.responseResult(json);
-                    }
-                }
+            int total = Integer.parseInt(hjsl);
+
+            int totalPage = total % size == 0?total/size:total/size+1;
 
-                PageHelper.startPage(curr, size);
+            if (curr<1){
+                curr =1;
+            }
+            if (curr>totalPage){
+                curr = totalPage;
             }
+            curr = (curr -1)*size;
+            pramsMap.put("curr",curr);
+
+
 
             List<BaseTDxRecordInvoice> pageList = super.baseMapper.selectInTellingCheck(pramsMap);
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index da563891..cd6f421b 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1410,7 +1410,11 @@
                 and qs_status = '1'
             </if>
 
-        /*keep orderby*/ ORDER BY tax_amount
+            ORDER BY tax_amount
+            <if test="isChooseAll != null and isChooseAll != '' and isChooseAll == 'Y'">
+                limit #{curr},#{size}
+            </if>
+
         ) AS subquery
         WHERE  <![CDATA[ max_tax <= #{maxTax} ]]>