客源报表增加时间范围的查询

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/report/VoyageStockBoardMapper.java

@@ -48,7 +48,7 @@ public interface VoyageStockBoardMapper {
      * @param voyageIds 航次ID列表
      * @return 游客列表（含证件类型、证件号、国籍及国籍名称）
      */
-    List<TradeVisitorDO> selectVisitorListForSourceDashboard(@Param("shipId") Long shipId, @Param("voyageIds") List<Long> voyageIds, @Param("distributorId") Long distributorId);
+    List<TradeVisitorDO> selectVisitorListForSourceDashboard(@Param("shipId") Long shipId, @Param("voyageIds") List<Long> voyageIds, @Param("voyageTime") List<String> voyageTime, @Param("distributorId") Long distributorId);
 
     /**
      * 查询游客年龄段分析看板所需的游客年龄列表
@@ -57,7 +57,7 @@ public interface VoyageStockBoardMapper {
      * @param voyageIds 航次ID列表
      * @return 游客年龄列表
      */
-    List<Integer> selectVisitorAgeListForAgeDashboard(@Param("shipId") Long shipId, @Param("voyageIds") List<Long> voyageIds, @Param("distributorId") Long distributorId);
+    List<Integer> selectVisitorAgeListForAgeDashboard(@Param("shipId") Long shipId, @Param("voyageIds") List<Long> voyageIds, @Param("voyageTime") List<String> voyageTime, @Param("distributorId") Long distributorId);
 
     /**
      * 查询所有航次库存分页

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/report/impl/VoyageStockBoardServiceImpl.java

@@ -682,7 +682,7 @@ public class VoyageStockBoardServiceImpl implements VoyageStockBoardService {
         Long distributorId = SecurityFrameworkUtils.getLoginDistributorId();
         for (Long shipId : reqVO.getShipIds()) {
             List<TradeVisitorDO> visitorList = voyageStockBoardMapper.selectVisitorListForSourceDashboard(
-                    shipId, reqVO.getVoyageIds(), distributorId);
+                    shipId, reqVO.getVoyageIds(), reqVO.getVoyageTime(), distributorId);
             if (CollUtil.isNotEmpty(visitorList)) {
                 allVisitorList.addAll(visitorList);
             }
@@ -966,7 +966,7 @@ public class VoyageStockBoardServiceImpl implements VoyageStockBoardService {
         Long distributorId = SecurityFrameworkUtils.getLoginDistributorId();
         for (Long shipId : reqVO.getShipIds()) {
             List<Integer> ageList = voyageStockBoardMapper.selectVisitorAgeListForAgeDashboard(
-                    shipId, reqVO.getVoyageIds(), distributorId);
+                    shipId, reqVO.getVoyageIds(), reqVO.getVoyageTime(), distributorId);
             if (CollUtil.isNotEmpty(ageList)) {
                 allAgeList.addAll(ageList);
             }

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/VoyageStockBoardMapper.xml

@@ -122,6 +122,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="voyageTime != null and voyageTime.size() > 0">
+            AND pv.boarding_time between #{voyageTime[0]} and #{voyageTime[1]}
+        </if>
         <if test="distributorId != null">
             AND tor.source_id = #{distributorId}
         </if>
@@ -143,6 +146,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="voyageTime != null and voyageTime.size() > 0">
+            AND pv.boarding_time between #{voyageTime[0]} and #{voyageTime[1]}
+        </if>
         <if test="distributorId != null">
             AND tor.source_id = #{distributorId}
         </if>