From 202f3c895965b447057de7c45b47688606443ccf Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 29 Jul 2024 15:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E7=BB=84?=
 =?UTF-8?q?=E5=A5=97=EF=BC=8C=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderDetailResultResponse.java    |  1 +
 .../mapper/inout/IoOrderDetailResultDao.xml   | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
index 34adc78f..2f363dfc 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
@@ -185,6 +185,7 @@ public class IoOrderDetailResultResponse {
     //金额
     private BigDecimal amount;
 
+    private Boolean isStack;
 
     private String invoiceEncode;
 
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index 37157e60..0638f44b 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -24,17 +24,20 @@
     </select>
 
     <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
-        SELECT a2.*,
+        SELECT
+        a2.*,
         a1.mainAction,
-        GROUP_CONCAT(ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',') as invoiceCodes,
-        b1.NAME AS                                                               fromCorpName,
-        (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
-        FROM io_order_detail_result a2
+        bu.isStack,
+        GROUP_CONCAT( ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',' ) AS invoiceCodes,
+        b1.NAME AS fromCorpName
+        ,basic_bussiness_type.name billTypeName
+        FROM
+        io_order_detail_result a2
         LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
         LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
-        left join basic_udirel bu on a2.bindRlFk = bu.id
-        left join io_order_invoice ioi on a1.billNo = ioi.orderIdFk
-
+        LEFT JOIN basic_udirel bu ON a2.bindRlFk = bu.id
+        left join basic_bussiness_type on a1.action = basic_bussiness_type.action
+        LEFT JOIN io_order_invoice ioi ON a1.billNo = ioi.orderIdFk
         <where>
             a1.status = 7
             <if test="orderIdFk != null and orderIdFk != ''">