zx 3 年 前
コミット
a648ec5a8c

+ 3 - 0
src/main/java/com/steerinfo/dil/controller/ShipDynamicsController.java

@@ -108,6 +108,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
             String locationValue2=null;
             String locationValue3=null;
             String locationValue4=null;
+            String dgsj=null;
             String locationStatus = list.get(i).get("locationStatus").toString();
             if ("未到闸船舶".equals(locationStatus)) {
                 capacity1 = list.get(i).get("capacity").toString();
@@ -135,6 +136,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 capacityNumber4 = list.get(i).get("capacityNumber").toString();
                 outPortTime4 = list.get(i).get("outPortTime").toString().substring(0, 10);
                 locationValue4 = list.get(i).get("locationValue").toString();
+                dgsj=list.get(i).get("dgsj").toString();
                 capacityNumberSum4 += Double.valueOf(capacityNumber4);
                 capacityNumberAllSum4+=Double.valueOf(capacityNumber4);
             }
@@ -154,6 +156,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
             map.put("capacityNumber4",capacityNumber4);
             map.put("locationValue4",locationValue4);
             map.put("outPortTime4",outPortTime4);
+            map.put("dgsj",dgsj);
             map.put("qqqqq", 12);                                                       //连续字母用于辨识数据结构!!!!
             map.put("portName", list.get(i).get("portName"));
             mapList.add(map);

+ 1 - 0
src/main/resources/com/steerinfo/dil/mapper/ShipDynamicsMapper.xml

@@ -13,6 +13,7 @@
                rc.capacity_number "capacity",
                tlsr.RESULT_ACTUAL_INSTALLATIONS "capacityNumber",
                tlsr.RESULT_OUT_PORT_TIME "outPortTime",
+               tlsr.RESULT_ARRIVAL_PORT_TIME "dgsj",
                tsl.LOCATION_STATUS "locationStatus",
                tsl.LOCATION_VALUE "locationValue",
                tsl.LOCATION_ROUTE_TIME