From af1bf3d009bd0ce8886d9787d2a6c1237e837f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Thu, 12 Sep 2024 10:47:44 +0800
Subject: [PATCH] =?UTF-8?q?feature:1=E3=80=82=E5=8F=91=E7=A5=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=87=AD=E8=AF=81=E5=8F=B7=E5=8C=BA?=
 =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2=EF=BC=8C2.=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoice/controller/InvoiceController.java |  2 ++
 .../module/invoice/model/OrderListQuery.java  |  8 ++++++
 .../mybatis/mapper/OrderInvoiceInfoMapper.xml | 28 ++++++++++++++++---
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceController.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceController.java
index aaa7804..ff9327a 100644
--- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceController.java
+++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceController.java
@@ -66,6 +66,8 @@ public class InvoiceController {
             log.debug("{}发票明细列表查询参数:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderBatchQuery));
             //数据转换
             Map<String, Object> paramMap = PageBeanConvertUtil.convertToMap(orderBatchQuery);
+            paramMap.put("pzhStart", orderBatchQuery.getPzhStart());
+            paramMap.put("pzhEnd", orderBatchQuery.getPzhEnd());
             if (StringUtils.isBlank(orderBatchQuery.getXhfNsrsbh())) {
                 log.error("{},请求税号为空!", LOGGER_MSG);
                 return R.error(OrderValidateEnum.TAXCODE_ISNULL.getKey(), OrderValidateEnum.TAXCODE_ISNULL.getMessage());
diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/OrderListQuery.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/OrderListQuery.java
index 2a215d8..8ce0f7c 100644
--- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/OrderListQuery.java
+++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/OrderListQuery.java
@@ -260,5 +260,13 @@ public class OrderListQuery {
      * 短信交付状态 0未交付 1已交付
      */
     private String shortMsgPushStatus;
+    /**
+     * 凭证号排序
+     */
+    private String pzhStart;
+    /**
+     * 订单号排序
+     */
+    private String pzhEnd;
 
 }
diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
index b2756f5..30c7c30 100644
--- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
+++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
@@ -1636,6 +1636,12 @@
             <if test="map.maxhjje!=null and map.maxhjje!= '' ">
                 and CAST(oii.kphjje AS DECIMAL(40,2)) &lt;= CAST(#{map.maxhjje,jdbcType=VARCHAR} as DECIMAL(40,2))
             </if>
+            <if test="map.pzhStart !=null and map.pzhStart != ''  ">
+                and CAST(oi.byzd2 AS UNSIGNED) &gt;= CAST(#{map.pzhStart,jdbcType=VARCHAR} as UNSIGNED)
+            </if>
+            <if test="map.pzhEnd !=null and map.pzhEnd != ''  ">
+                and CAST(oi.byzd2 AS UNSIGNED) &lt;= CAST(#{map.pzhEnd,jdbcType=VARCHAR} as UNSIGNED)
+            </if>
         </where>
     </sql>
 
@@ -1649,11 +1655,25 @@
             <when test="map.orderBy !=null and map.orderBy == 'checkTime' ">
                 order by check_time desc
             </when>
-            <when test="map.orderBy !=null and map.orderBy == 'pzhAsc' ">
-                order by CONVERT(oi.byzd2, UNSIGNED) asc,kprq DESC
+            <when test="map.orderBy !=null and map.orderBy == '88' ">
+                order by CASE
+                WHEN oi.byzd2 IS NULL OR oi.byzd2 = '' THEN 1
+                ELSE 0
+                END,
+                CONVERT(oi.byzd2, UNSIGNED) asc,ddh DESC
+            </when>
+            <when test="map.orderBy !=null and map.orderBy == '99' ">
+                order by CASE
+                WHEN oi.byzd2 IS NULL OR oi.byzd2 = '' THEN 1
+                ELSE 0
+                END,
+                CONVERT(oi.byzd2, UNSIGNED) asc,ddh asc
+            </when>
+            <when test="map.orderBy !=null and map.orderBy == '66' ">
+                order by CONVERT(oi.byzd2, UNSIGNED) DESC,ddh DESC
             </when>
-            <when test="map.orderBy !=null and map.orderBy == 'pzhDesc' ">
-                order by CONVERT(oi.byzd2, UNSIGNED) desc,kprq DESC
+            <when test="map.orderBy !=null and map.orderBy == '77' ">
+                order by CONVERT(oi.byzd2, UNSIGNED) DESC,ddh asc
             </when>
             <otherwise>
                 ORDER BY kprq DESC