clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-05-09 15:02:21 +08:00
parent 1abb02f464
commit c07f80e18f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -1008,7 +1008,9 @@ public class OrderController extends BaseController {
orderMasterReq.setExceptOrderMasterIds(masterIdSet);
List<OrderMaster> masterList = orderMasterService.selectOrderMasterList(orderMasterReq);
allList.addAll(masterList);
logger.info("符合条件的主单数据{}总数{}allList的数量{}",masterList,count,allList.size());
List<Long> mateIds=allList.stream().map(OrderMaster::getId)
.collect(Collectors.toList());
logger.info("查询符合条件的主单条件{}总数{}allList的数量{}allist的主单id{}",orderMasterReq,count,allList.size(),mateIds);
// 超时查询需要排除同个师傅的主单子单同时出现
if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
// 需要排除同个师傅的主单子单同时出现
@ -1037,7 +1039,9 @@ public class OrderController extends BaseController {
}
count += filteredMasterList.size();
logger.info("主单filteredMasterList超时数量{}总数{}",filteredMasterList.size(),count);
mateIds=filteredMasterList.stream().map(OrderMaster::getId)
.collect(Collectors.toList());
logger.info("主单filteredMasterList超时数量{}总数{},filteredMasterList的id集合{}",filteredMasterList.size(),count,mateIds);
if (CollectionUtils.isEmpty(filteredMasterList)){
count += masterList.size();
}