工时报表加异常单号

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -816,10 +816,20 @@
         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,
+        LEFT JOIN (SELECT NST.SITE,
+        NST.SFC,
+        NST.STEP_ID,
+        LISTAGG(NST.ABNORMAL_NO, ';') WITHIN GROUP ( ORDER BY NST.ABNORMAL_NO)    ABNORMAL_NO,
+        LISTAGG(NST.DUTY_TYPE, ';') WITHIN GROUP ( ORDER BY NST.ABNORMAL_NO)      DUTY_TYPE,
+        LISTAGG(NST.DUTY_DEPART, ';') WITHIN GROUP ( ORDER BY NST.ABNORMAL_NO)    DUTY_DEPART,
+        LISTAGG(NST.PRINCIPAL_USER, ';') WITHIN GROUP ( ORDER BY NST.ABNORMAL_NO) PRINCIPAL_USER,
+        LISTAGG(NST.NC_CODE_DESCRIPTION, ';')
+        WITHIN GROUP ( ORDER BY NST.ABNORMAL_NO)                          NC_CODE_DESCRIPTION
+        FROM (
+        SELECT zab.SITE                                                              SITE,
         zab.ABNORMAL_NO                                                       ABNORMAL_NO,
         zab.SFC                                                               SFC,
-        zab.OPERATION                                                         OPERATION,
+        RSP.STEP_ID                                                           STEP_ID,
         (SELECT LISTAGG(DFV.DESCRIPTION, ',') WITHIN GROUP ( ORDER BY DFV.DATA_VALUE )
         FROM (
         SELECT DFL.DATA_VALUE DATA_VALUE,
@@ -845,16 +855,21 @@
         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
+        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'
+        LEFT JOIN ROUTER rs ON zabd.ROUTER_BO = RS.HANDLE
+        LEFT JOIN ROUTER_STEP RSP ON RSP.ROUTER_BO = rs.HANDLE
         WHERE zab.TYPE = 'Z'
-        AND SFC IS NOT NULL
+        AND ZAB.SFC IS NOT NULL
-        GROUP BY zab.SITE, zab.ABNORMAL_NO, zab.SFC, zab.OPERATION, zabd.DUTY_TYPE, zabd.DUTY_DEPART,
+        AND RSP.STEP_ID IS NOT NULL
-        zabd.PRINCIPAL_USER) NEWSQL  ON  NEWSQL.SITE = zsd.SITE AND NEWSQL.SFC = zsd.SFC AND NEWSQL.OPERATION = zsd.OPERATION
+        GROUP BY zab.SITE, zab.ABNORMAL_NO, zab.SFC, RSP.STEP_ID, zabd.DUTY_TYPE, zabd.DUTY_DEPART,
+        zabd.PRINCIPAL_USER) NST
+        GROUP BY NST.SITE, NST.SFC, NST.STEP_ID) NEWSQL
+        ON NEWSQL.SITE = zsd.SITE AND NEWSQL.SFC = zsd.SFC AND NEWSQL.STEP_ID = zsd.STEP_ID
         <where>
             zsd.SITE = #{site}
             <if test="workCenter != null and workCenter != ''">