修改代码

Ran
1 parent f162b806
Showing 2 changed files with 23 additions and 4 deletions
src/main/java/com/order/erp/domain/vo/order/OrderLockFieldVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
  
 import java.io.Serializable;
+import java.util.List;
  
 /**
  * @author makejava
@@ -42,4 +43,9 @@ public class OrderLockFieldVO implements Serializable {
      */
     private OrderInspectionStageFieldVO inspectionStageFields;
  
+    /**
+     * 导出指定订单id集合
+     */
+    private List<Long> orderIds;
+
 }
@@ -913,7 +913,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) {
             return false;
-        } else if ("FAIL" .equals(inspectionStageInfo.getEndCheckResult())) {
+        } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) {
             return false;
         }
         return true;
@@ -1327,8 +1327,19 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 orderIds.add(-1L);
             }
         }
-        if (CollectionUtils.isNotEmpty(orderIds)) {
-            queryVO.setOrderIds(orderIds);
+
+        //wmr：修改代码，导出指定的订单，2023.12.28
+        if (!CollectionUtils.isEmpty(queryVO.getOrderIds())) {
+            if (CollectionUtils.isNotEmpty(orderIds)) {
+                Set<Long> collect = queryVO.getOrderIds().stream()
+                        .filter(orderIds::contains)
+                        .collect(Collectors.toSet());
+                queryVO.setOrderIds(collect);
+            }
+        } else {
+            if (CollectionUtils.isNotEmpty(orderIds)) {
+                queryVO.setOrderIds(orderIds);
+            }
         }
         return new LambdaQueryWrapper<OrderBaseInfoDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
@@ -1352,6 +1363,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 ;
     }
  
+
     /**
      * 新增数据
      *
@@ -1478,7 +1490,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
      * @param orderBaseInfoDo
      * @param userId
      */
-    public OrderFieldLockApplyDO handlerProfitRate(OrderProfitAnalysisVO profitAnalysisVO, OrderBaseInfoDO orderBaseInfoDo, Long userId) {
+    public OrderFieldLockApplyDO handlerProfitRate(OrderProfitAnalysisVO profitAnalysisVO, OrderBaseInfoDO
+            orderBaseInfoDo, Long userId) {
         OrderProfitAnalysisFieldVO profitAnalysisFieldVO = profitAnalysis2profitAnalysisField(orderBaseInfoDo, profitAnalysisVO);
  
         SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>()