代码优化

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/mapper/OrderInvoicingMapper.java

 package org.dromara.server.mapper;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.server.domain.OrderInvoicing;
 import org.dromara.server.domain.vo.OrderInvoicingVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+import java.util.List;
 
 /**
  * 开票订单关联Mapper接口
@@ -12,4 +17,19 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface OrderInvoicingMapper extends BaseMapperPlus<OrderInvoicing, OrderInvoicingVo> {
 
+    /**
+     * 查询订单ids
+     *
+     * @param orderType 订单类型
+     * @param projectId 项目id
+     * @return 订单ids
+     */
+    default List<Long> selectOrderIds(String orderType, Long projectId) {
+        List<OrderInvoicing> list = selectList(new LambdaQueryWrapper<OrderInvoicing>()
+            .eq(OrderInvoicing::getType, orderType)
+            .eq(OrderInvoicing::getProjectId, projectId)
+            .select(OrderInvoicing::getOrderId));
+        return CollectionUtil.isEmpty(list) ? List.of(-1L) : StreamUtils.toList(list, OrderInvoicing::getOrderId);
+    }
+
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderAirportServiceImpl.java

@@ -58,6 +58,7 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
     private final ScheduledExecutorService scheduledExecutorService;
     private final IBizUserService bizUserService;
     private final IOrderInvoicingService orderInvoicingService;
+    private final OrderInvoicingMapper orderInvoicingMapper;
 
     @Override
     public BaseMapperPlus<OrderAirport, OrderAirportVo> mapper() {
@@ -127,6 +128,10 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
             if (StringUtils.isNotEmpty(endTime)) {
                 lqw.le(OrderAirport::getBookDatetime, endTime);
             }
+            if (params.get("projectId") != null) {
+                List<Long> orderIds = orderInvoicingMapper.selectOrderIds(OrderType.AIRPORT.getType(), Long.parseLong(params.get("projectId").toString()));
+                lqw.in(OrderAirport::getId, orderIds);
+            }
         }
         return lqw;
     }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderHotelServiceImpl.java

@@ -55,6 +55,7 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
     private final ScheduledExecutorService scheduledExecutorService;
     private final IBizUserService bizUserService;
     private final IOrderInvoicingService orderInvoicingService;
+    private final OrderInvoicingMapper orderInvoicingMapper;
 
     @Override
     public BaseMapperPlus<OrderHotel, OrderHotelVo> mapper() {
@@ -128,6 +129,11 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
             if (StringUtils.isNotEmpty(checkInDateEnd)) {
                 lqw.le(OrderHotel::getCheckInDate, checkInDateEnd);
             }
+
+            if (params.get("projectId") != null) {
+                List<Long> orderIds = orderInvoicingMapper.selectOrderIds(OrderType.HOTEL.getType(), Long.parseLong(params.get("projectId").toString()));
+                lqw.in(OrderHotel::getId, orderIds);
+            }
         }
         return lqw;
     }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderTrainServiceImpl.java

@@ -60,6 +60,7 @@ public class OrderTrainServiceImpl extends AbstractBaseService<OrderTrainVo, Ord
     private final ScheduledExecutorService scheduledExecutorService;
     private final IBizUserService bizUserService;
     private final IOrderInvoicingService orderInvoicingService;
+    private final OrderInvoicingMapper orderInvoicingMapper;
 
 
     @Override
@@ -135,6 +136,11 @@ public class OrderTrainServiceImpl extends AbstractBaseService<OrderTrainVo, Ord
             if (StringUtils.isNotEmpty(endTime)) {
                 lqw.le(OrderTrain::getBookDate, endTime);
             }
+
+            if (params.get("projectId") != null) {
+                List<Long> orderIds = orderInvoicingMapper.selectOrderIds(OrderType.TRAIN.getType(), Long.parseLong(params.get("projectId").toString()));
+                lqw.in(OrderTrain::getId, orderIds);
+            }
         }
         return lqw;
     }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderVehiclesServiceImpl.java

@@ -53,6 +53,7 @@ public class OrderVehiclesServiceImpl extends AbstractBaseService<OrderVehiclesV
     private final ScheduledExecutorService scheduledExecutorService;
     private final IBizUserService bizUserService;
     private final IOrderInvoicingService orderInvoicingService;
+    private final OrderInvoicingMapper orderInvoicingMapper;
 
     @Override
     public BaseMapperPlus<OrderVehicles, OrderVehiclesVo> mapper() {
@@ -146,6 +147,10 @@ public class OrderVehiclesServiceImpl extends AbstractBaseService<OrderVehiclesV
             if (StringUtils.isNotEmpty(endTime)) {
                 lqw.le(OrderVehicles::getBookDate, endTime);
             }
+            if (params.get("projectId") != null) {
+                List<Long> orderIds = orderInvoicingMapper.selectOrderIds(OrderType.CAR.getType(), Long.parseLong(params.get("projectId").toString()));
+                lqw.in(OrderVehicles::getId, orderIds);
+            }
         }
         return lqw;
     }