Merge remote-tracking branch 'origin/main'

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyage/VoyageController.java

@@ -140,7 +140,19 @@ public class VoyageController {
     @Operation(summary = "获得资源管理-航次列表")
     public CommonResult<List<VoyageRespVO>> listByShipId(Long shipId) {
         List<VoyageDO> list = voyageService.getListByShipId(shipId);
-        return success(BeanUtils.toBean(list, VoyageRespVO.class));
+        List<VoyageRespVO> voyageRespVOS = BeanUtils.toBean(list, VoyageRespVO.class);
+        List<Long> routeIds = CollectionUtils.convertList(voyageRespVOS, VoyageRespVO::getRouteId);
+        List<ResourceRouteDO> routeList = routeService.getList(routeIds);
+        Map<Long, Integer> routeDoMap = CollectionUtils.convertMap(routeList, ResourceRouteDO::getId, ResourceRouteDO::getDirection);
+        voyageRespVOS.stream().forEach(voyageRespVO -> {
+            MapUtils.findAndThen(routeDoMap, voyageRespVO.getRouteId(), direction -> voyageRespVO.setDirection(direction));
+            if(routeDoMap.get(voyageRespVO.getRouteId()) == 2) {
+                voyageRespVO.setFname(voyageRespVO.getName()+"-下水");
+            }else {
+                voyageRespVO.setFname(voyageRespVO.getName()+"-上水");
+            }
+        });
+        return success(voyageRespVOS);
     }
 
     @GetMapping("/list-calendar")