航次库存添加航线的筛选

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

@@ -18,4 +18,7 @@ public class VoyageReqVO {
     @Schema(description = "渠道(1:表示旅行社，2：表示小程序)", example = "1")
     private String channel;
 
+    @Schema(description = "航次时间")
+    private String[] voyageTime;
+
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestock/vo/VoyageStockPageReqVO.java

@@ -21,6 +21,9 @@ public class VoyageStockPageReqVO extends PageParam {
     @Schema(description = "船ID", example = "6357")
     private Long shipId;
 
+    @Schema(description = "航线", example = "4445")
+    private Long routeId;
+
     @Schema(description = "航次ID列表", example = "1,2")
     private List<Long> voyageIds;
 

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyage/VoyageMapper.java

@@ -1,5 +1,6 @@
 package com.yc.ship.module.product.dal.mysql.voyage;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -44,12 +45,26 @@ public interface VoyageMapper extends BaseMapperX<VoyageDO> {
     }
 
     default List<VoyageDO> selectListSimple(VoyageReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<VoyageDO>()
+        LambdaQueryWrapper<VoyageDO> wrapper = new LambdaQueryWrapperX<VoyageDO>()
                 .eqIfPresent(VoyageDO::getShipId, reqVO.getShipId())
                 .eqIfPresent(VoyageDO::getRouteId, reqVO.getRouteId())
                 .eq(VoyageDO::getShelfStatus, VoyageShelfStatusEnum.ON_SHELF.getValue())
                 .likeIfPresent(VoyageDO::getChannel, reqVO.getChannel())
-                .orderByAsc(VoyageDO::getStartTime));
+                .orderByAsc(VoyageDO::getStartTime);
+
+        String[] voyageTime = reqVO.getVoyageTime();
+        if (voyageTime != null && voyageTime.length >= 2
+                && voyageTime[0] != null && voyageTime[1] != null) {
+            wrapper.between(VoyageDO::getStartTime, voyageTime[0], voyageTime[1]);
+        }
+        return selectList(wrapper);
+       /* return selectList(new LambdaQueryWrapperX<VoyageDO>()
+                .eqIfPresent(VoyageDO::getShipId, reqVO.getShipId())
+                .eqIfPresent(VoyageDO::getRouteId, reqVO.getRouteId())
+                .eq(VoyageDO::getShelfStatus, VoyageShelfStatusEnum.ON_SHELF.getValue())
+                .betweenIfPresent(VoyageDO::getStartTime, reqVO.getVoyageTime()[0], reqVO.getVoyageTime()[1])
+                .likeIfPresent(VoyageDO::getChannel, reqVO.getChannel())
+                .orderByAsc(VoyageDO::getStartTime));*/
     }
 
     default List<VoyageDO> selectOnShelfListByShipId(Long shipId) {

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyagestock/VoyageStockMapper.java

@@ -37,6 +37,7 @@ public interface VoyageStockMapper extends BaseMapperX<VoyageStockDO> {
                 .selectAs("pv.route_id", VoyageStockDO::getRouteId);
         wrapperX.likeIfPresent(VoyageStockDO::getVoyageName, reqVO.getVoyageName())
                 .eqIfPresent(VoyageStockDO::getShipId, reqVO.getShipId())
+                .eqIfPresent(VoyageDO::getRouteId, reqVO.getRouteId())
                 .inIfPresent(VoyageStockDO::getVoyageId, reqVO.getVoyageIds())
                 .betweenIfPresent(VoyageDO::getStartTime, reqVO.getVoyageTime()[0], reqVO.getVoyageTime()[1])
                 .orderByAsc(VoyageDO::getStartTime);

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyage/VoyageServiceImpl.java

@@ -345,6 +345,10 @@ public class VoyageServiceImpl implements VoyageService {
 
     @Override
     public List<VoyageDO> getListSimple(VoyageReqVO reqVO) {
+        String[] voyageTime = reqVO.getVoyageTime();
+        if(voyageTime != null && voyageTime.length > 0) {
+            voyageTime[1] += " 23:59:59";
+        }
         return voyageMapper.selectListSimple(reqVO);
     }