|
@@ -145,20 +145,6 @@ public class TmsshipShipLocationController extends BaseRESTfulController {
|
|
|
if (con!=null&&!"".equals(con)){
|
|
|
mapVal.put("con",con);
|
|
|
}
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
- //通过时间查询数据
|
|
|
- Object dayTime = mapVal.get("dayTime");
|
|
|
- Date date;
|
|
|
- String timeFormat;
|
|
|
- if(dayTime != null){
|
|
|
-
|
|
|
- date = new Date((long) dayTime);
|
|
|
- timeFormat = sdf.format(date);
|
|
|
- }else {
|
|
|
- date = new Date();
|
|
|
- timeFormat = sdf.format(date);
|
|
|
- }
|
|
|
- mapVal.put("dayTime", timeFormat);
|
|
|
List<Map<String, Object>> columnList = tmsshipShipLocationService.selectShipLocationList(mapVal);
|
|
|
return success(columnList);
|
|
|
}
|