canrd-outside / order-erp · Commits

Commit a20fbc3b553797d874caf4bd668ad43f065791d5

Authored by Ran
1 parent f162b806
build: skipped

修改代码

Inline Side-by-side
Showing 2 changed files with 23 additions and 4 deletions
src/main/java/com/order/erp/domain/vo/order/OrderLockFieldVO.java
  View file @a20fbc3
@@ -4,6 +4,7 @@ import lombok.*; @@ -4,6 +4,7 @@ import lombok.*;
4 import lombok.experimental.SuperBuilder; 4 import lombok.experimental.SuperBuilder;
5 5
6 import java.io.Serializable; 6 import java.io.Serializable;
  7 +import java.util.List;
7 8
8 /** 9 /**
9 * @author makejava 10 * @author makejava
@@ -42,4 +43,9 @@ public class OrderLockFieldVO implements Serializable { @@ -42,4 +43,9 @@ public class OrderLockFieldVO implements Serializable {
42 */ 43 */
43 private OrderInspectionStageFieldVO inspectionStageFields; 44 private OrderInspectionStageFieldVO inspectionStageFields;
44 45
  46 + /**
  47 + * 导出指定订单id集合
  48 + */
  49 + private List<Long> orderIds;
  50 +
45 } 51 }
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @a20fbc3
@@ -913,7 +913,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -913,7 +913,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
913 } 913 }
914 if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) { 914 if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) {
915 return false; 915 return false;
916 - } else if ("FAIL" .equals(inspectionStageInfo.getEndCheckResult())) { 916 + } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) {
917 return false; 917 return false;
918 } 918 }
919 return true; 919 return true;
@@ -1327,8 +1327,19 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -1327,8 +1327,19 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1327 orderIds.add(-1L); 1327 orderIds.add(-1L);
1328 } 1328 }
1329 } 1329 }
1330 - if (CollectionUtils.isNotEmpty(orderIds)) {  
1331 - queryVO.setOrderIds(orderIds); 1330 +
  1331 + //wmr：修改代码，导出指定的订单，2023.12.28
  1332 + if (!CollectionUtils.isEmpty(queryVO.getOrderIds())) {
  1333 + if (CollectionUtils.isNotEmpty(orderIds)) {
  1334 + Set<Long> collect = queryVO.getOrderIds().stream()
  1335 + .filter(orderIds::contains)
  1336 + .collect(Collectors.toSet());
  1337 + queryVO.setOrderIds(collect);
  1338 + }
  1339 + } else {
  1340 + if (CollectionUtils.isNotEmpty(orderIds)) {
  1341 + queryVO.setOrderIds(orderIds);
  1342 + }
1332 } 1343 }
1333 return new LambdaQueryWrapper<OrderBaseInfoDO>() 1344 return new LambdaQueryWrapper<OrderBaseInfoDO>()
1334 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 1345 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
@@ -1352,6 +1363,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -1352,6 +1363,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1352 ; 1363 ;
1353 } 1364 }
1354 1365
  1366 +
1355 /** 1367 /**
1356 * 新增数据 1368 * 新增数据
1357 * 1369 *
@@ -1478,7 +1490,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -1478,7 +1490,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1478 * @param orderBaseInfoDo 1490 * @param orderBaseInfoDo
1479 * @param userId 1491 * @param userId
1480 */ 1492 */
1481 - public OrderFieldLockApplyDO handlerProfitRate(OrderProfitAnalysisVO profitAnalysisVO, OrderBaseInfoDO orderBaseInfoDo, Long userId) { 1493 + public OrderFieldLockApplyDO handlerProfitRate(OrderProfitAnalysisVO profitAnalysisVO, OrderBaseInfoDO
  1494 + orderBaseInfoDo, Long userId) {
1482 OrderProfitAnalysisFieldVO profitAnalysisFieldVO = profitAnalysis2profitAnalysisField(orderBaseInfoDo, profitAnalysisVO); 1495 OrderProfitAnalysisFieldVO profitAnalysisFieldVO = profitAnalysis2profitAnalysisField(orderBaseInfoDo, profitAnalysisVO);
1483 1496
1484 SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>() 1497 SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>()