From 2e75f5792ef3558cf0356e9a3c08d3e6ab086a86 Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 12 Nov 2021 13:37:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=8F=90=E6=8A=A5?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E3=80=81=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=97=B6=E9=97=B4=E9=80=BB=E8=BE=91=EF=BC=9B?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=80=85=E5=8A=A0=E5=B7=A5=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=81=E8=B0=83=E6=95=B4=E6=80=BB=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ReportMapper.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index d495511a..118efe3f 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -333,12 +333,12 @@ CF.VALUE ITEM_SPEC, ZRRT.ACTUAL_START_DATE ACTUAL_START_DATE,ZRRT.ACTUAL_COMPLETE_DATE ACTUAL_COMPLETE_DATE, '' SHUT_DOWN_TIME,/*暂时无法计算*/ - CASE WHEN ZRRT.WAIT_END_DATE IS NOT NULL THEN TO_CHAR(TO_NUMBER((ZRRT.WAIT_END_DATE -ZRRT.WAIT_START_DATE)*24),'FM9999990.000') - ELSE TO_CHAR(TO_NUMBER((SYSDATE-(ZRRT.WAIT_START_DATE + 8/24))*24),'FM9999990.000') - END REPAIR_WAIT_TIME, - CASE WHEN ZRRT.ACTUAL_COMPLETE_DATE IS NOT NULL THEN TO_CHAR(TO_NUMBER((ZRRT.ACTUAL_COMPLETE_DATE-ZRRT.CREATED_DATE_TIME-ZRRT.WAIT_TIME)*24),'FM9999990.000') + 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') ELSE TO_CHAR(TO_NUMBER((SYSDATE- 8/24 - ZRRT.CREATED_DATE_TIME-ZRRT.WAIT_TIME)*24),'FM9999990.000') - END REPAIR_TIME, + END REPAIR_TIME , CASE WHEN ZRRT.STATUS = '401' THEN '待维修' WHEN ZRRT.STATUS = '501' THEN '维修中' WHEN ZRRT.STATUS = '502' THEN '维修等待' @@ -347,7 +347,7 @@ WHEN ZRRT.STATUS = '601' THEN '报修单确认' END STATUS ,ZRRT.REPORT_USER REPORT_USER,ZNU.FULL_NAME REPORT_USER_DESCRIPTION, - ZRRT.REPAIR_USERS ,ZRRT.REMARK + ZRRT.REPAIR_USERS ,ZRRT.REMARK , ZRRT.CREATED_DATE_TIME REPORT_DATE_TIME FROM Z_RESOURCE_REPAIR_TASK ZRRT INNER JOIN RESRCE R ON R.RESRCE = ZRRT.RESOURCE_NO AND R.SITE = ZRRT.SITE @@ -742,8 +742,10 @@ CASE WHEN zab.NC_QTY IS NOT NULL THEN zsd.DISPATCH_QTY - TO_NUMBER(zab.NC_QTY) ELSE zsd.DISPATCH_QTY END QUALIFIED_NUM, - zsd.PROD_HOURS, - zsd.ACTUAL_PROD_HOURS, + 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 , zsd.EMPLOYEE_DESCRIPTION, zsd.ACTUAL_START_DATE, zsd.ACTUAL_COMPLETE_DATE,