|
|
@ -17,10 +17,7 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
|
import java.io.IOException; |
|
|
import java.io.IOException; |
|
|
import java.util.ArrayList; |
|
|
|
|
|
import java.util.Calendar; |
|
|
|
|
|
import java.util.Date; |
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -45,15 +42,15 @@ public class PortTransitCycleServiceImpl extends ServiceImpl<PortTransitCycleMap |
|
|
|
|
|
|
|
|
Date now = new Date(); |
|
|
Date now = new Date(); |
|
|
|
|
|
|
|
|
// 只处理“前端有值”的 |
|
|
|
|
|
|
|
|
// 陆运 |
|
|
if(model.getLuyun() != null){ |
|
|
if(model.getLuyun() != null){ |
|
|
saveOrUpdateOne(model, "陆运", model.getLuyun(), now); |
|
|
saveOrUpdateOne(model, "陆运", model.getLuyun(), now); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 海运 |
|
|
if(model.getHaiyun() != null){ |
|
|
if(model.getHaiyun() != null){ |
|
|
saveOrUpdateOne(model, "海运", model.getHaiyun(), now); |
|
|
saveOrUpdateOne(model, "海运", model.getHaiyun(), now); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 空运 |
|
|
if(model.getKongyun() != null){ |
|
|
if(model.getKongyun() != null){ |
|
|
saveOrUpdateOne(model, "空运", model.getKongyun(), now); |
|
|
saveOrUpdateOne(model, "空运", model.getKongyun(), now); |
|
|
} |
|
|
} |
|
|
@ -90,6 +87,11 @@ public class PortTransitCycleServiceImpl extends ServiceImpl<PortTransitCycleMap |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public List<Map<String, Object>> getDetail(String departure, String destination) { |
|
|
|
|
|
return baseMapper.getDetail(departure, destination); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public List<PortTransitCycleVo> calculateArrivalTime(PortTransitCycleVo data) { |
|
|
public List<PortTransitCycleVo> calculateArrivalTime(PortTransitCycleVo data) { |
|
|
List<PortTransitCycleVo> list = baseMapper.getListByModel(data); |
|
|
List<PortTransitCycleVo> list = baseMapper.getListByModel(data); |
|
|
@ -194,4 +196,5 @@ public class PortTransitCycleServiceImpl extends ServiceImpl<PortTransitCycleMap |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |