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

1

This commit is contained in:
cb 2025-05-09 14:45:47 +08:00
parent fc38c49162
commit 1abb02f464
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,13 +1001,14 @@ public class OrderController extends BaseController {
allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster)); allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster));
} }
} }
// 查询主单 // 查询主单
OrderMaster orderMasterReq = new OrderMaster(); OrderMaster orderMasterReq = new OrderMaster();
BeanUtils.copyProperties(orderListRequest, orderMasterReq); BeanUtils.copyProperties(orderListRequest, orderMasterReq);
orderMasterReq.setExceptOrderMasterIds(masterIdSet); orderMasterReq.setExceptOrderMasterIds(masterIdSet);
List<OrderMaster> masterList = orderMasterService.selectOrderMasterList(orderMasterReq); List<OrderMaster> masterList = orderMasterService.selectOrderMasterList(orderMasterReq);
allList.addAll(masterList); allList.addAll(masterList);
logger.info("符合条件的主单数据{}",masterList); logger.info("符合条件的主单数据{}总数{}allList的数量{}",masterList,count,allList.size());
// 超时查询需要排除同个师傅的主单子单同时出现 // 超时查询需要排除同个师傅的主单子单同时出现
if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) { if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
// 需要排除同个师傅的主单子单同时出现 // 需要排除同个师傅的主单子单同时出现
@ -1036,7 +1037,8 @@ public class OrderController extends BaseController {
} }
count += filteredMasterList.size(); count += filteredMasterList.size();
if (filteredMasterList.isEmpty()){ logger.info("主单filteredMasterList超时数量{}总数{}",filteredMasterList.size(),count);
if (CollectionUtils.isEmpty(filteredMasterList)){
count += masterList.size(); count += masterList.size();
} }
} else { } else {