修改”

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

@@ -49,7 +49,11 @@ public class ShipDynamicsController extends BaseRESTfulController {
         }
         oneDate.setMinutes(0);
         oneDate.setSeconds(0);
-        mapVal.put("oneDate",sdf.format(oneDate));
+        if(mapVal.get("oneDate")==null){
+            mapVal.put("oneDate",sdf.format(oneDate));
+        }else{
+            mapVal.put("oneDate",sdf.format(new Date((Long)mapVal.get("oneDate"))));
+        }
          List<Map<String, Object>> list = iShipDynamicsService.selectAll(mapVal);
         if (list.size()==0){
 //            System.out.println("暂时没有位置作业");

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

@@ -39,34 +39,38 @@ public class ShipDynamicsServiceImpl implements IShipDynamicsService {
     public List<Map<String, Object>> getLoadData(Map<String,Object> map){
         String startTime;
         String endTime;
+        Date endDate=new Date();
+        Date startDate=new Date();
+        List<Map<String, Object>> list;
         if(map.get("startTime")!=null&&map.get("endTime")!=null){
             startTime=map.get("startTime")+"";
             endTime=map.get("endTime")+"";
             DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+            list = shipDynamicsMapper.getLoadData(map);
         }else{
-            Date endDate=new Date();
             endDate.setHours(8);
             endDate.setMinutes(0);
             endDate.setSeconds(0);
             Calendar calendar=Calendar.getInstance();
             calendar.setTime(endDate);
             calendar.add(Calendar.DATE, -1);
-            Date startDate=calendar.getTime();
+            startDate=calendar.getTime();
             startDate.setHours(8);
             startDate.setMinutes(0);
             startDate.setSeconds(0);
             startTime = startDate.getTime()+"";
             endTime = endDate.getTime()+"";
-            String time="" +(startDate.getMonth()+1)+"月"+startDate.getDate()+"日"+startDate.getHours()+"时至"
-            +"" +(endDate.getMonth()+1)+"月"+endDate.getDate()+"日"+endDate.getHours()+"时";
             DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
-            List<Map<String, Object>> list = shipDynamicsMapper.getLoadData(map);
-            if(list !=null && list.size()>0){
-                list.get(0).put("time",time);
-            }
-            return list;
+            list = shipDynamicsMapper.getLoadData(map);
+        }
+        startDate=new Date(Long.parseLong(startTime));
+        endDate=new Date(Long.parseLong(endTime));
+        String time="" +(startDate.getMonth()+1)+"月"+startDate.getDate()+"日"+startDate.getHours()+"时至"
+                +"" +(endDate.getMonth()+1)+"月"+endDate.getDate()+"日"+endDate.getHours()+"时";
+        if(list !=null && list.size()>0){
+            list.get(0).put("time",time);
         }
-        return shipDynamicsMapper.getLoadData(map);
+        return list;
     }
 
     @Override

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

@@ -306,6 +306,7 @@
                     APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
                     DBI.INFACTORY_SHIP_NAME     "infactoryShipName",
                     ADN.RESULT_NUMBER_OF_LOANS  "resultNumberOfLoads",
+                    ADN.NOTICE_DELIVERY_TIME "noticeDeliveryTime",
                     DB.INSERT_TIME
     from AMSSHIP_DELIVERY_NOTICE ADN
            LEFT JOIN DIL_BATCH_INFACOTRY DBI