as

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -301,4 +301,10 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(omstruckOrderSeparateService.closeInwardOrder(orderId, sqe));
     }
 
+
+    @ApiOperation(value = "计时查询进程")
+    @PostMapping("/getTimeOrderResult")
+    public RESTfulResult getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map){
+        return success(omstruckOrderSeparateService.getTimeOrderResult(map));
+    }
 }

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.java

@@ -136,4 +136,7 @@ public interface OmstruckOrderSeparateMapper {
 
     //根据订单ID查询信息
     Map<String, Object> getOrderMesByOrderId(BigDecimal orderId);
+
+    //查询计时进程
+    List<Map<String, Object>> getTimeOrderResult(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/IOmstruckOrderSeparateService.java

@@ -50,4 +50,6 @@ public interface IOmstruckOrderSeparateService {
     List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map);
 
     List<Map<String,Object>> getPauseTimeTaskDetail(Integer orderId);
+
+    List<Map<String, Object>> getTimeOrderResult(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -679,4 +679,43 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         return omstruckOrderMapper.getPauseTimeTaskDetail(orderId);
     }
 
+
+    /**
+     * 计时查看进程方法
+     * @Author TXF
+     * @Date 2022/3/18 10:33
+     * @param map
+     * @return
+     **/
+    public List<Map<String, Object>> getTimeOrderResult(Map<String, Object> map){
+        List<Map<String, Object>> mapList = omstruckOrderSeparateMapper.getTimeOrderResult(map);
+        List<Map<String, Object>> returnMap = new ArrayList<>();
+        if(mapList.size() == 0){
+            return null;
+        }else {
+            int sqe = 1;
+            for (Map<String, Object> mesMap : mapList) {
+                int type = DataChange.dataToBigDecimal(mesMap.get("resultTimeType")).intValue();
+                switch (type){
+                    case 1:
+                        mesMap.put("linkName", "计时开始");
+                        mesMap.put("segmentSqe", sqe ++);
+                        break;
+                    case 3:
+                        mesMap.put("linkName", "计时结束");
+                        mesMap.put("segmentSqe", sqe ++);
+                        break;
+                    case 5:
+                        mesMap.put("linkName", "开始暂停计时");
+                        mesMap.put("segmentSqe", sqe ++);
+                        break;
+                    case 7:
+                        mesMap.put("linkName", "结束暂停计时");
+                        mesMap.put("segmentSqe", sqe ++);
+                }
+                returnMap.add(mesMap);
+            }
+        }
+        return returnMap;
+    }
 }

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -166,7 +166,7 @@
     </select>
 
 <!--    通过总实绩ID和路段顺序号查询进厂实绩数据 -->
-    <select id="getEnFactoryMes" parameterType="map" resultType="java.util.Map">
+        <select id="getEnFactoryMes" parameterType="map" resultType="java.util.Map">
         select RG.GATEPOST_NAME             "pointName",
                TER.RESULT_ENTRY_GATE_TIME   "pointDate"
         from TMSTRUCK_ENFACTORY_RESULT TER
@@ -794,4 +794,14 @@
         where OO.ORDER_ID = #{orderId}
     </select>
 
+    <select id="getTimeOrderResult" parameterType="map" resultType="java.util.LinkedHashMap">
+        select TTTR.RESULT_TIME "pointDate",
+               TTTR.RESULT_TIME_TYPE    "resultTimeType"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
+                 left join TMSTRUCK_TIME_TASK_RESULT TTTR on TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        where OO.ORDER_ID = #{orderId}
+        order by TTTR.RESULT_TIME
+    </select>
+
 </mapper>