Merge remote-tracking branch 'origin/master'

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

@@ -155,7 +155,30 @@ public class OffSiteTransportationServiceImpl implements OffSiteTransportationSe
 
     @Override
     public List<Map<String, Object>> transportationPerformance(Map<String, Object> mapValue) {
-        return offSiteTransportationMapper.transportationPerformance(mapValue);
+        List<Map<String, Object>> mapList = offSiteTransportationMapper.transportationPerformance(mapValue);
+        mapList.stream().forEach(item->{
+            String unloadingWaitingTime=  item.get("unloadingWaitingTime")+"";
+            if ((!unloadingWaitingTime.equals(""))&&(!unloadingWaitingTime.equals("null"))&&unloadingWaitingTime!=null){
+                String time="";
+                String[] values = unloadingWaitingTime.substring(8, 19).split(" ");
+                if (!values[0].equals("00")){
+                    time=values[0]+"天";
+                }
+                item.put("unloadingWaitingTime",time+values[1]);
+            }
+            String transportationTime=  item.get("transportationTime")+"";
+            if ((!transportationTime.equals(""))&&(!transportationTime.equals("null"))&&transportationTime!=null){
+
+                String time="";
+                String[] values = transportationTime.substring(8,19).split(" ");
+                if (!values[0].equals("00")){
+                    time=values[0]+"天";
+                }
+                item.put("transportationTime",time+values[1]);
+            }
+
+        });
+        return mapList;
     }
 
     @Override

src/main/java/com/steerinfo/inPlantNavigation/service/impl/IPMMSVertexServiceImpl.java

@@ -138,8 +138,8 @@ public class IPMMSVertexServiceImpl implements IIPMMSVertexService {
         int minimumValue=10000000;
         for (String key :keys){
             int[] value = currentBestDinstance.get(key);
-            if (minimumValue>value[1]){
-                minimumValue=value[1];
+            if (minimumValue>value[0]){
+                minimumValue=value[0];
                 vertex=key;
             }
         }