Merge remote-tracking branch 'origin/master'

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtOrderHourServiceImpl.java

@@ -537,8 +537,10 @@ public class GxtOrderHourServiceImpl implements IGxtOrderHourService {
         if (repairOrder != null) {
             //repairOrder.getParams().put("beginOccurTime", startTime);
             //repairOrder.getParams().put("endOccurTime", endTime);
-            repairOrder.getParams().put("beginCompleteTime", startTime);
-            repairOrder.getParams().put("endCompleteTime", endTime);
+            //repairOrder.getParams().put("beginCompleteTime", startTime);
+            //repairOrder.getParams().put("endCompleteTime", endTime);
+            repairOrder.getParams().put("beginRealEndTime", startTime);
+            repairOrder.getParams().put("endRealEndTime", endTime);
         }
         
         // 为维保工单设置时间范围（使用createTime）
@@ -546,8 +548,10 @@ public class GxtOrderHourServiceImpl implements IGxtOrderHourService {
         if (workOrder != null) {
             //workOrder.getParams().put("beginCreateTime", startTime);
             //workOrder.getParams().put("endCreateTime", endTime);
-            workOrder.getParams().put("beginCompleteTime", startTime);
-            workOrder.getParams().put("endCompleteTime", endTime);
+            //workOrder.getParams().put("beginCompleteTime", startTime);
+            //workOrder.getParams().put("endCompleteTime", endTime);
+            workOrder.getParams().put("beginRealEndTime", startTime);
+            workOrder.getParams().put("endRealEndTime", endTime);
         }
     }
     
@@ -1138,9 +1142,10 @@ public class GxtOrderHourServiceImpl implements IGxtOrderHourService {
             order.setAcceptHour((diffMillis - acceptSuspensionTime) / (1000.0 * 60 * 60));
         }
 
-        // 准备时长 = 开始打卡时间 – 下发时间 - 开工前挂起时长
-        if (order.getRealStartTime() != null && order.getAssignTime() != null) {
-            long diffMillis = order.getRealStartTime().getTime() - order.getAssignTime().getTime() - suspensionTimes[1] ;
+        // 准备时长 = 开始打卡时间 – 接单时间 - 开工前挂起时长
+        if (order.getRealStartTime() != null && order.getAcceptTime() != null) {
+            //long diffMillis = order.getRealStartTime().getTime() - order.getAssignTime().getTime() - suspensionTimes[1] ;
+            long diffMillis = order.getRealStartTime().getTime() - order.getAcceptTime().getTime() - suspensionTimes[1] ;
             order.setPrepareHour(diffMillis / (1000.0 * 60 * 60));
         }
         

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

@@ -128,9 +128,12 @@
                     <if test="repairOrder.scoringStatus != null"> and scoring_status = #{repairOrder.scoringStatus}</if>
                     <if test="repairOrder.params.beginOccurTime != null"> AND occur_time &gt;= #{repairOrder.params.beginOccurTime}</if>
                     <if test="repairOrder.params.endOccurTime != null"> AND occur_time &lt;= #{repairOrder.params.endOccurTime}</if>
-                    <!-- 时间范围查询条件 - 使用结单时间 -->
+
                     <if test="repairOrder.params.beginCompleteTime != null"> AND t.id IN (SELECT DISTINCT order_id FROM gxt_repair_order_flow WHERE action_type IN ('complete','auto_finalize') AND action_time &gt;= #{repairOrder.params.beginCompleteTime})</if>
                     <if test="repairOrder.params.endCompleteTime != null"> AND t.id IN (SELECT DISTINCT order_id FROM gxt_repair_order_flow WHERE action_type IN ('complete','auto_finalize') AND action_time &lt;= #{repairOrder.params.endCompleteTime})</if>
+                    <!-- 时间范围查询条件 - 使用结束时间 -->
+                    <if test="repairOrder.params.beginRealEndTime != null"> AND real_end_time &gt;= #{repairOrder.params.beginRealEndTime}</if>
+                    <if test="repairOrder.params.endRealEndTime != null"> AND real_end_time &lt;= #{repairOrder.params.endRealEndTime}</if>
                     <!-- 业务特定数据权限过滤条件 -->
                     <if test="repairOrder != null and repairOrder.params.businessDataScope != null and repairOrder.params.businessDataScope != ''">
                         ${repairOrder.params.businessDataScope}
@@ -209,9 +212,12 @@
                     <if test="workOrder.scoringStatus != null"> and scoring_status = #{workOrder.scoringStatus}</if>
                     <if test="workOrder.params.beginCreateTime != null"> AND create_time &gt;= #{workOrder.params.beginCreateTime}</if>
                     <if test="workOrder.params.endCreateTime != null"> AND create_time &lt;= #{workOrder.params.endCreateTime}</if>
-                    <!-- 时间范围查询条件 - 使用结单时间 -->
+
                     <if test="workOrder.params.beginCompleteTime != null"> AND t.id IN (SELECT DISTINCT order_id FROM gxt_work_order_flow WHERE action_type IN ('complete','auto_finalize')  AND action_time &gt;= #{workOrder.params.beginCompleteTime})</if>
                     <if test="workOrder.params.endCompleteTime != null"> AND t.id IN (SELECT DISTINCT order_id FROM gxt_work_order_flow WHERE action_type IN ('complete','auto_finalize') AND action_time &lt;= #{workOrder.params.endCompleteTime})</if>
+                    <!-- 时间范围查询条件 - 使用结束时间 -->
+                    <if test="workOrder.params.beginRealEndTime != null"> AND real_end_time &gt;= #{workOrder.params.beginRealEndTime}</if>
+                    <if test="workOrder.params.endRealEndTime != null"> AND real_end_time &lt;= #{workOrder.params.endRealEndTime}</if>
                     <!-- 业务特定数据权限过滤条件 -->
                     <if test="workOrder != null and workOrder.params.businessDataScope != null and workOrder.params.businessDataScope != ''">
                         ${workOrder.params.businessDataScope}