修改代码

Ran
1 parent ca1e6a43
Showing 2 changed files with 16 additions and 5 deletions
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -180,5 +180,8 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
      */
     private String businessPerson;
  
+    
+    private List<Long> exportOrderIds;
+
 }
  
@@ -197,8 +197,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (Objects.isNull(lockFieldVO)) {
             throw new BusinessException("请选择要导出的列！");
         }
-        LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = buildQueryByParam(queryVO);
-        List<OrderBaseInfoDO> orderBaseInfoDOList = list(queryWrapper);
+        List<OrderBaseInfoDO> orderBaseInfoDOList = new ArrayList<>();
+        if (!Objects.isNull(queryVO.getFieldVO()) && !CollectionUtils.isEmpty(queryVO.getFieldVO().getOrderIds())) {
+            orderBaseInfoDOList = listByIds(queryVO.getFieldVO().getOrderIds());
+        } else {
+            LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = buildQueryByParam(queryVO);
+            orderBaseInfoDOList = list(queryWrapper);
+        }
+
         if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
             List<OrderInfoResultVO> resultVOList = orderBaseInfoDOList.stream().map(x -> {
                 OrderInfoResultVO resultVO = new OrderInfoResultVO();
@@ -206,6 +212,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 return resultVO;
             }).collect(Collectors.toList());
  
+
             if (Objects.nonNull(lockFieldVO.getProfitAnalysisFields())) {
                 // 填充利润分析
                 fillProfitAnalysisInfo(resultVOList);
@@ -241,6 +248,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
             }
         }
+
     }
  
     /**
@@ -1112,7 +1120,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         List<OrderFieldLockApplyDO> fieldLockApplyDOList = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderFieldLockApplyDO::getApplyUserId, dataScope.getLoginUserId())
-                .in(OrderFieldLockApplyDO::getStatus, new int[]{ApplyStatusEnum.WAIT_AUDIT.getStatus(),ApplyStatusEnum.AUDIT_REFUSE.getStatus()})
+                .in(OrderFieldLockApplyDO::getStatus, new int[]{ApplyStatusEnum.WAIT_AUDIT.getStatus(), ApplyStatusEnum.AUDIT_REFUSE.getStatus()})
                 .in(OrderFieldLockApplyDO::getOrderId, orderIds).orderByAsc(OrderFieldLockApplyDO::getId));
  
         if (CollectionUtils.isNotEmpty(fieldLockApplyDOList)) {
@@ -1342,9 +1350,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
 //            }
 //        }
  
-        if(queryVO.getFieldVO()!=null&&queryVO.getFieldVO().getOrderIds()!=null){
+        if (queryVO.getFieldVO() != null && queryVO.getFieldVO().getOrderIds() != null) {
             Set<Long> collect = new HashSet<>(queryVO.getFieldVO().getOrderIds());
-            if (collect.size()>0){
+            if (collect.size() > 0) {
                 queryVO.setOrderIds(collect);
             }
         }