From 78efa27d03ca164de3ca92dc6e85e3e0c16dd888 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Mon, 21 Nov 2022 14:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=8A=A5=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ReportMapper.xml    | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index d114758c..fb447bc7 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -795,7 +795,12 @@
         WHEN ZUR.TEMPORARY_USER = 'false' THEN '正式' END EMPLOYEE_ATTR,
         zsd.ACTUAL_START_DATE,
         zsd.ACTUAL_COMPLETE_DATE,
-        zsd.REMARK
+        zsd.REMARK,
+        NEWSQL.ABNORMAL_NO,
+        NEWSQL.DUTY_TYPE,
+        NEWSQL.DUTY_DEPART,
+        NEWSQL.PRINCIPAL_USER,
+        NEWSQL.NC_CODE_DESCRIPTION
         FROM Z_SFC_DISPATCH zsd
         LEFT JOIN Z_USER_RESOURCE ZUR ON zsd.RESRCE = ZUR.RESRCE
         AND zsd.EMPLOYEE_DESCRIPTION like CONCAT(ZUR.USER_DESCRIPTION, '%')
@@ -811,6 +816,45 @@
         LEFT JOIN OPERATION_T ot ON ot.OPERATION_BO = o.HANDLE AND ot.LOCALE = 'zh'
         LEFT JOIN Z_INSPECTION_TASK zit ON zit.SFC_DISPATCH_BO = zsd.HANDLE
         LEFT JOIN Z_ABNORMAL_BILL zab ON zab.OBJECT_BO = zit.HANDLE
+        LEFT JOIN (SELECT zab.SITE                                                              SITE,
+        zab.ABNORMAL_NO                                                       ABNORMAL_NO,
+        zab.SFC                                                               SFC,
+        zab.OPERATION                                                         OPERATION,
+        (SELECT LISTAGG(DFV.DESCRIPTION, ',') WITHIN GROUP ( ORDER BY DFV.DATA_VALUE )
+        FROM (
+        SELECT DFL.DATA_VALUE DATA_VALUE,
+        DFLT.DATA_TAG  DESCRIPTION,
+        DF.DATA_FIELD  DATA_FIELD
+        FROM DATA_FIELD DF
+        INNER JOIN DATA_FIELD_LIST DFL ON DF.HANDLE = DFL.DATA_FIELD_BO
+        LEFT JOIN DATA_FIELD_LIST_T DFLT
+        ON DFL.HANDLE = DFLT.DATA_FIELD_LIST_BO AND DFLT.LOCALE = 'zh'
+        ) DFV
+        WHERE INSTR(zabd.DUTY_TYPE, DFV.DATA_VALUE) > 0
+        AND DFV.DATA_FIELD = 'RESPONSIBILITY_TYPE')                        DUTY_TYPE,
+        (SELECT LISTAGG(DFV.DESCRIPTION, ',') WITHIN GROUP ( ORDER BY DFV.DATA_VALUE )
+        FROM (
+        SELECT DFL.DATA_VALUE DATA_VALUE,
+        DFLT.DATA_TAG  DESCRIPTION,
+        DF.DATA_FIELD  DATA_FIELD
+        FROM DATA_FIELD DF
+        INNER JOIN DATA_FIELD_LIST DFL ON DF.HANDLE = DFL.DATA_FIELD_BO
+        LEFT JOIN DATA_FIELD_LIST_T DFLT
+        ON DFL.HANDLE = DFLT.DATA_FIELD_LIST_BO AND DFLT.LOCALE = 'zh'
+        ) DFV
+        WHERE INSTR(zabd.DUTY_DEPART, DFV.DATA_VALUE) > 0
+        AND DFV.DATA_FIELD = 'RESPONSIBILITY_DEPARTMENT')                  DUTY_DEPART,
+        zabd.PRINCIPAL_USER                                                   PRINCIPAL_USER,
+        LISTAGG(nct.DESCRIPTION, ';') WITHIN GROUP (ORDER BY zab.ABNORMAL_NO) NC_CODE_DESCRIPTION
+        FROM Z_ABNORMAL_BILL zab
+        INNER JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zab.HANDLE = zabd.ABNORMAL_BILL_BO
+        INNER JOIN Z_ABNORMAL_NC_CODE zanc ON zab.HANDLE = zanc.ABNORMAL_BILL_BO
+        INNER JOIN NC_CODE nc ON zanc.NC_CODE = nc.NC_CODE AND nc.SITE = zab.SITE
+        INNER JOIN NC_CODE_T nct ON nct.NC_CODE_BO = nc.HANDLE AND nct.LOCALE = 'zh'
+        WHERE zab.TYPE = 'Z'
+        AND SFC IS NOT NULL
+        GROUP BY zab.SITE, zab.ABNORMAL_NO, zab.SFC, zab.OPERATION, zabd.DUTY_TYPE, zabd.DUTY_DEPART,
+        zabd.PRINCIPAL_USER) NEWSQL  ON  NEWSQL.SITE = zsd.SITE AND NEWSQL.SFC = zsd.SFC AND NEWSQL.OPERATION = zsd.OPERATION
         <where>
             zsd.SITE = #{site}
             <if test="workCenter != null and workCenter != ''">