diff --git a/src/main/java/com/xujie/modules/port/controller/PortTransitCycleController.java b/src/main/java/com/xujie/modules/port/controller/PortTransitCycleController.java index 286c465..6de7f44 100644 --- a/src/main/java/com/xujie/modules/port/controller/PortTransitCycleController.java +++ b/src/main/java/com/xujie/modules/port/controller/PortTransitCycleController.java @@ -21,6 +21,7 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.List; +import java.util.Map; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -55,6 +56,12 @@ public class PortTransitCycleController { baseService.saveModel(model); return R.ok(); } + @PostMapping("/getDetail") + public R getDetail(String departure, String destination){ + List> list = + baseService.getDetail(departure, destination); + return R.ok().put("data", list); + } /** * 分组统计查询(按始发港和目的港汇总不同运输方式的周期) */ diff --git a/src/main/java/com/xujie/modules/port/dao/PortTransitCycleMapper.java b/src/main/java/com/xujie/modules/port/dao/PortTransitCycleMapper.java index 66ba084..196bd6b 100644 --- a/src/main/java/com/xujie/modules/port/dao/PortTransitCycleMapper.java +++ b/src/main/java/com/xujie/modules/port/dao/PortTransitCycleMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -33,4 +34,9 @@ public interface PortTransitCycleMapper extends BaseMapper { PortTransitCycle selectOneByUnique(@Param("departure") String departure, @Param("destination") String destination, @Param("shipMethod") String shipMethod); + + String getMethodNoByDesc(@Param("methodDesc") String methodDesc); + + List> getDetail(@Param("departure") String departure, + @Param("destination") String destination); } diff --git a/src/main/java/com/xujie/modules/port/service/Iface/IPortTransitCycleService.java b/src/main/java/com/xujie/modules/port/service/Iface/IPortTransitCycleService.java index 877e9c0..cba2ba2 100644 --- a/src/main/java/com/xujie/modules/port/service/Iface/IPortTransitCycleService.java +++ b/src/main/java/com/xujie/modules/port/service/Iface/IPortTransitCycleService.java @@ -9,6 +9,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.util.List; +import java.util.Map; /** *

@@ -38,4 +39,6 @@ public interface IPortTransitCycleService extends IService { * 批量保存上传的数据 */ void batchSave(MultipartFile file); + + List> getDetail(String departure, String destination); } diff --git a/src/main/java/com/xujie/modules/port/service/Impl/PortTransitCycleServiceImpl.java b/src/main/java/com/xujie/modules/port/service/Impl/PortTransitCycleServiceImpl.java index f9e57ba..62c65d7 100644 --- a/src/main/java/com/xujie/modules/port/service/Impl/PortTransitCycleServiceImpl.java +++ b/src/main/java/com/xujie/modules/port/service/Impl/PortTransitCycleServiceImpl.java @@ -17,10 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; 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; /** @@ -45,15 +42,15 @@ public class PortTransitCycleServiceImpl extends ServiceImpl> getDetail(String departure, String destination) { + return baseMapper.getDetail(departure, destination); + } + @Override public List calculateArrivalTime(PortTransitCycleVo data) { List list = baseMapper.getListByModel(data); @@ -194,4 +196,5 @@ public class PortTransitCycleServiceImpl extends ServiceImpl + + + + +