驾驶舱-工时统计计算所用时间修改

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -563,12 +563,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 m.nick_name AS chargePerson,
                 <if test="repairPerson != null and repairPerson == 'true'">u.nick_name AS repairPerson,ROUND(wop.final_score,2) AS score,</if>
                 <if test="repairPerson == null or repairPerson == '' or repairPerson == 'false'">ROUND(wo.score,2) AS score,</if>
-                ROUND(TIMESTAMPDIFF( MINUTE, wo.create_time, assign.assign_time ) / 60,2) AS xfsc,
-                ROUND(TIMESTAMPDIFF( MINUTE, assign.assign_time, accept.accept_time ) / 60,2) AS xysc,
-                ROUND(TIMESTAMPDIFF( MINUTE, accept.accept_time, process.process_time ) / 60,2) AS zbsc,
-                ROUND(TIMESTAMPDIFF( MINUTE, process.process_time, complete.complete_time ) / 60,2) AS tjsc,
-                ROUND(TIMESTAMPDIFF( MINUTE, complete.complete_time, restart.restart_time ) / 60,2) AS qjbwsc,
-                ROUND(( TIMESTAMPDIFF( MINUTE, wo.create_time, restart.restart_time ) / 60 ) - ( TIMESTAMPDIFF( MINUTE, approved.approved_time, resume.resume_time ) / 60 ),2) AS clsc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.create_time, wo.assign_time ) / 60,2) AS xfsc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.assign_time, wo.accept_time ) / 60,2) AS xysc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.accept_time, wo.real_start_time ) / 60,2) AS zbsc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.real_start_time, wo.real_end_time ) / 60,2) AS tjsc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.real_end_time, wo.restart_time ) / 60,2) AS qjbwsc,
+                ROUND(( TIMESTAMPDIFF( MINUTE, wo.create_time, wo.restart_time ) / 60 ) - ( TIMESTAMPDIFF( MINUTE, approved.approved_time, resume.resume_time ) / 60 ),2) AS clsc,
                 ROUND(TIMESTAMPDIFF( MINUTE, approved.approved_time, resume.resume_time ) / 60,2) AS gqsc
             FROM
                 gxt_work_order wo
@@ -622,12 +622,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 m.nick_name AS chargePerson,
                 <if test="repairPerson != null and repairPerson == 'true'">u.nick_name AS repairPerson,ROUND(wop.final_score,2) AS score,</if>
                 <if test="repairPerson == null or repairPerson == '' or repairPerson == 'false'">ROUND(wo.score,2) AS score,</if>
-                ROUND(TIMESTAMPDIFF( MINUTE, wo.occur_time, assign.assign_time ) / 60,2) AS xfsc,
-                ROUND(TIMESTAMPDIFF( MINUTE, assign.assign_time, accept.accept_time ) / 60,2) AS xysc,
-                ROUND(TIMESTAMPDIFF( MINUTE, accept.accept_time, process.process_time ) / 60,2) AS zbsc,
-                ROUND(TIMESTAMPDIFF( MINUTE, process.process_time, complete.complete_time ) / 60,2) AS tjsc,
-                ROUND(TIMESTAMPDIFF( MINUTE, complete.complete_time, restart.restart_time ) / 60,2) AS qjbwsc,
-                ROUND(( TIMESTAMPDIFF( MINUTE, wo.occur_time, restart.restart_time ) / 60 ) - ( TIMESTAMPDIFF( MINUTE, approved.approved_time, resume.resume_time ) / 60 ),2) AS clsc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.occur_time, wo.assign_time ) / 60,2) AS xfsc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.assign_time, wo.accept_time ) / 60,2) AS xysc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.accept_time, wo.real_start_time ) / 60,2) AS zbsc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.real_start_time, wo.real_end_time ) / 60,2) AS tjsc,
+                ROUND(TIMESTAMPDIFF( MINUTE, wo.real_end_time, wo.restart_time ) / 60,2) AS qjbwsc,
+                ROUND(( TIMESTAMPDIFF( MINUTE, wo.occur_time, wo.restart_time ) / 60 ) - ( TIMESTAMPDIFF( MINUTE, approved.approved_time, resume.resume_time ) / 60 ),2) AS clsc,
                 ROUND(TIMESTAMPDIFF( MINUTE, approved.approved_time, resume.resume_time ) / 60,2) AS gqsc
             FROM
                 gxt_repair_order wo