diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 118efe3f..2d1ee9a0 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -336,7 +336,7 @@ CASE WHEN ZRRT.ACTUAL_START_DATE IS NOT NULL THEN TO_CHAR(TO_NUMBER((ZRRT.ACTUAL_START_DATE -ZRRT.CREATED_DATE_TIME)*24),'FM9999990.000') ELSE TO_CHAR(TO_NUMBER((SYSDATE -ZRRT.CREATED_DATE_TIME)*24),'FM9999990.000') END REPORT_WAIT_TIME , - CASE WHEN ZRRT.ACTUAL_COMPLETE_DATE IS NOT NULL THEN TO_CHAR(TO_NUMBER((ZRRT.ACTUAL_COMPLETE_DATE-ZRRT.CREATED_DATE_TIME)*24) - ZRRT.WAIT_TIME,'FM9999990.000') + CASE WHEN ZRRT.ACTUAL_COMPLETE_DATE IS NOT NULL THEN TO_CHAR(TO_NUMBER((ZRRT.ACTUAL_COMPLETE_DATE-ZRRT.CREATED_DATE_TIME)*24) - NVL(ZRRT.WAIT_TIME,0),'FM9999990.000') ELSE TO_CHAR(TO_NUMBER((SYSDATE- 8/24 - ZRRT.CREATED_DATE_TIME-ZRRT.WAIT_TIME)*24),'FM9999990.000') END REPAIR_TIME , CASE WHEN ZRRT.STATUS = '401' THEN '待维修' @@ -743,9 +743,10 @@ WHEN zab.NC_QTY IS NOT NULL THEN zsd.DISPATCH_QTY - TO_NUMBER(zab.NC_QTY) ELSE zsd.DISPATCH_QTY END QUALIFIED_NUM, NVL(zsd.PROD_HOURS,0) PROD_HOURS, - NVL(zsd.ACTUAL_PROD_HOURS,"") ACTUAL_PROD_HOURS,, - CASE WHEN ZSD.PROD_HOURS IS NOT NULL AND ZSD.DISPATCH_QTY IS NOT NULL THEN ROUND(ZSD.PROD_HOURS*ZSD.DISPATCH_QTY,2) - ELSE 0 END TOTAL_PROD_HOURS , + NVL(zsd.ACTUAL_PROD_HOURS,0) ACTUAL_PROD_HOURS, + CASE WHEN ZSD.PROD_HOURS IS NULL THEN 0 + WHEN zab.NC_QTY IS NOT NULL THEN ROUND((zsd.DISPATCH_QTY - TO_NUMBER(zab.NC_QTY))*ZSD.PROD_HOURS ,4) + ELSE ROUND(zsd.DISPATCH_QTY*ZSD.PROD_HOURS ,4) END TOTAL_PROD_HOURS , zsd.EMPLOYEE_DESCRIPTION, zsd.ACTUAL_START_DATE, zsd.ACTUAL_COMPLETE_DATE,