From 0eb5eade848c435ca07e36434fca67a8ed4e198c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Wed, 8 Sep 2021 10:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=BE=85=E5=8A=9E=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anomaly/src/main/resources/mapper/AbnormalBillMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index cfbce631..7c89599f 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -947,7 +947,7 @@
         ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME,
         ZNU.FULL_NAME CREATED_USER,
         ZAB.NC_CODE NC_CODE,ZAB.PB_DESCRIPTION PB_DESCRIPTION,
-        SUBSTR(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO),0,LENGTH(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO))-1) NC_CODE_DESCRIPTION
+        LISTAGG(NCT.DESCRIPTION , ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO) NC_CODE_DESCRIPTION
         FROM Z_ABNORMAL_BILL ZAB
         LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO = ZAB.HANDLE
         LEFT JOIN ITEM I ON ZAB.ITEM_BO = I.HANDLE
@@ -982,7 +982,7 @@
                 <if test="abnormalBill.status == 'COMP'.toString()">
                     AND zab.PROGRAM = 'true' AND zab.CORRECTION = 'true' AND zab.status != 'G'
                 </if>
-                <if test="abnormalBill.status == ''">
+                <if test="abnormalBill.status == '' and abnormalBill.type == 'Z'.toString()">
                     AND zab.STATUS != 'Q' AND zab.STATUS != 'G'
                 </if>
                 <if test="abnormalBill.startDateTime != null ">