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

@@ -141,6 +141,7 @@ public class VoyageController {
         Map<Long, RouteRespDTO> longRouteRespDTOMap = routeApi.queryRoute(routeIds);
         voyageRespVOS.stream().forEach(item -> {
             MapUtils.findAndThen(shipDOMap, item.getShipId(), shipDO -> item.setShipName(shipDO.getName()));
+            MapUtils.findAndThen(shipDOMap, item.getShipId(), shipDO -> item.setShortShipName(shipDO.getShortName()));
             MapUtils.findAndThen(longRouteRespDTOMap, item.getRouteId(), routeRespDTO -> {
                 item.setRouteResp(routeRespDTO);
                 item.setRouteName(routeRespDTO.getName());

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

@@ -112,6 +112,9 @@ public class VoyageRespVO {
     @Schema(description = "船名")
     private String shipName;
 
+    @Schema(description = "船名简称")
+    private String shortShipName;
+
     @Schema(description = "线路名称")
     private String routeName;
 

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestockdistributeNew/vo/VoyageStockDistributeNewPageReqVO.java

@@ -35,6 +35,9 @@ public class VoyageStockDistributeNewPageReqVO extends PageParam {
     @Schema(description = "航次ID", example = "1")
     private List<Long> voyageIds;
 
+    @Schema(description = "航次时间")
+    private String[] voyageTime;
+
 
 
 

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestock/VoyageStockServiceImpl.java

@@ -70,7 +70,7 @@ public class VoyageStockServiceImpl implements VoyageStockService {
     @Override
     public PageResult<VoyageStockRespVO> getVoyageStockPage(VoyageStockPageReqVO pageReqVO) {
         String[] voyageTime = pageReqVO.getVoyageTime();
-        if(voyageTime == null && voyageTime.length > 0) {
+        if(voyageTime != null && voyageTime.length > 0) {
             voyageTime[1] += " 23:59:59";
         }
         PageResult<VoyageStockDO> pageResult = voyageStockMapper.selectPage(pageReqVO);