From 025d9cf35b6982c4be551bccb2a53fa3421f4801 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Tue, 8 Nov 2022 14:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=82=E5=B8=B8=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9=E7=94=A8=E6=88=B7=E7=BB=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/AbnormalPlanMapper.xml   | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/anomaly/src/main/resources/mapper/AbnormalPlanMapper.xml b/anomaly/src/main/resources/mapper/AbnormalPlanMapper.xml
index 00c0a66d..396c5dbf 100644
--- a/anomaly/src/main/resources/mapper/AbnormalPlanMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalPlanMapper.xml
@@ -554,14 +554,27 @@
 
 
     <select id="findAbnormalPlan" resultMap="abnormalPlanDto">
-        SELECT  ZAP.ABNORMAL_NO ABNORMAL_NO ,ZAP.ABNORMAL_METHOD ABNORMAL_METHOD ,
-        ZAP.SHOP_ORDER SHOP_ORDER ,R.RESRCE RESRCE,R.DESCRIPTION RESRCE_DESCRIPTION,ZAP.STATUS STATUS ,I.ITEM ITEM,
-        IT.DESCRIPTION ITEM_DESCRIPTION,ZAP.QTY QTY ,ZNU.FULL_NAME FULL_NAME,
-               ZAP.SEND_USER_GROUP SEND_USER_GROUP,UGP.DESCRIPTION SEND_USER_GROUP_DESCRIPTION,ROUTER REPAIR_ROUTER,RT.HANDLE RT_HANDLE
-        FROM  Z_ABNORMAL_PLAN ZAP
-        INNER JOIN Z_ABNORMAL_BILL ZAB  ON ZAB.ABNORMAL_NO = ZAP.ABNORMAL_NO AND ZAB.SITE = #{abnormalPlanDto.site}
-                    AND ZAB.TYPE = 'Z'
-        INNER JOIN Z_ABNORMAL_BILL_DISPOSE ZBD ON ZAB.HANDLE=ZBD.ABNORMAL_BILL_BO
+        SELECT ZAP.ABNORMAL_NO                                           ABNORMAL_NO,
+        ZAP.ABNORMAL_METHOD                                       ABNORMAL_METHOD,
+        ZAP.SHOP_ORDER                                            SHOP_ORDER,
+        R.RESRCE                                                  RESRCE,
+        R.DESCRIPTION                                             RESRCE_DESCRIPTION,
+        ZAP.STATUS                                                STATUS,
+        I.ITEM                                                    ITEM,
+        IT.DESCRIPTION                                            ITEM_DESCRIPTION,
+        ZAP.QTY                                                   QTY,
+        ZNU.FULL_NAME                                             FULL_NAME,
+        ZAP.SEND_USER_GROUP                                       SEND_USER_GROUP,
+        (SELECT LISTAGG(UGP.DESCRIPTION, ',') WITHIN GROUP ( ORDER BY UGP.USER_GROUP )
+        FROM USER_GROUP UGP
+        WHERE instr(ZAP.SEND_USER_GROUP, UGP.USER_GROUP) > 0) AS SEND_USER_GROUP_DESCRIPTION,
+        ROUTER                                                    REPAIR_ROUTER,
+        RT.HANDLE                                                 RT_HANDLE
+        FROM Z_ABNORMAL_PLAN ZAP
+        INNER JOIN Z_ABNORMAL_BILL ZAB ON ZAB.ABNORMAL_NO = ZAP.ABNORMAL_NO AND ZAB.SITE = #{abnormalPlanDto.site}
+        AND ZAB.TYPE = 'Z'
+        INNER JOIN Z_ABNORMAL_BILL_DISPOSE ZBD
+        ON ZAB.HANDLE=ZBD.ABNORMAL_BILL_BO
         LEFT JOIN ROUTER RT ON RT.HANDLE=ZBD.ROUTER_BO
         LEFT JOIN RESRCE R ON R.RESRCE = ZAP.RESRCE AND R.SITE = ZAP.SITE
         LEFT JOIN ITEM I ON I.HANDLE = ZAP.ITEM_BO