驾驶舱-工时以结束时间为基准

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

@@ -708,7 +708,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="startTime != null ">
                     <choose>
                         <when test="(xfsc != null and xfsc == 'true') or (xysc != null and xysc == 'true') or (zbsc != null and zbsc == 'true') or (tjsc != null and tjsc == 'true') or (qjbwsc != null and qjbwsc == 'true') or (clsc != null and clsc == 'true') or (gqsc != null and gqsc == 'true')">
-                            AND gsflow.finish_time > #{startTime}
+                            AND wo.real_end_time > #{startTime}
                         </when>
                         <when test="score != null and score == 1">
                             AND gfflow.score_time > #{startTime}
@@ -721,7 +721,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="endTime != null ">
                     <choose>
                         <when test="(xfsc != null and xfsc == 'true') or (xysc != null and xysc == 'true') or (zbsc != null and zbsc == 'true') or (tjsc != null and tjsc == 'true') or (qjbwsc != null and qjbwsc == 'true') or (clsc != null and clsc == 'true') or (gqsc != null and gqsc == 'true')">
-                            AND gsflow.finish_time <![CDATA[<]]> #{endTime}
+                            AND wo.real_end_time <![CDATA[<]]> #{endTime}
                         </when>
                         <when test="score != null and score == 1">
                             AND gfflow.score_time <![CDATA[<]]> #{endTime}
@@ -800,7 +800,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="startTime != null ">
                     <choose>
                         <when test="(xfsc != null and xfsc == 'true') or (xysc != null and xysc == 'true') or (zbsc != null and zbsc == 'true') or (tjsc != null and tjsc == 'true') or (qjbwsc != null and qjbwsc == 'true') or (clsc != null and clsc == 'true') or (gqsc != null and gqsc == 'true')">
-                            AND gsflow.finish_time > #{startTime}
+                            AND wo.real_end_time > #{startTime}
                         </when>
                         <when test="score != null and score == 1">
                             AND gfflow.score_time > #{startTime}
@@ -813,7 +813,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="endTime != null ">
                     <choose>
                         <when test="(xfsc != null and xfsc == 'true') or (xysc != null and xysc == 'true') or (zbsc != null and zbsc == 'true') or (tjsc != null and tjsc == 'true') or (qjbwsc != null and qjbwsc == 'true') or (clsc != null and clsc == 'true') or (gqsc != null and gqsc == 'true')">
-                            AND gsflow.finish_time <![CDATA[<]]> #{endTime}
+                            AND wo.real_end_time <![CDATA[<]]> #{endTime}
                         </when>
                         <when test="score != null and score == 1">
                             AND gfflow.score_time <![CDATA[<]]> #{endTime}