设备维修记录报表新增提报时间字段、调整维修时间逻辑；操作者加工完成表新增实际工时字段、调整总工时逻辑

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,