|
|
|
|
@ -171,9 +171,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrderDto entity) { |
|
|
|
|
//烧结 热表订单
|
|
|
|
|
//热表订单
|
|
|
|
|
List<YieldOrderEnum> yieldTypeList = new ArrayList<>(); |
|
|
|
|
yieldTypeList.add(YieldOrderEnum.getEnum(entity.getYieldType())); |
|
|
|
|
yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_1); |
|
|
|
|
List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList,null); |
|
|
|
|
if (CollectionUtils.isNotEmpty(dataList)) { |
|
|
|
|
// 1. 收集所有需要查询的 taskingId
|
|
|
|
|
@ -184,7 +184,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(taskingIdList)) { |
|
|
|
|
// 2. 批量查询任务信息(一次数据库查询)
|
|
|
|
|
// 2. 批量查询任务信息
|
|
|
|
|
List<DsTaskingEntity> taskingList = taskingService.listByIds(taskingIdList); |
|
|
|
|
|
|
|
|
|
// 3. 收集所有需要查询的用户ID,直接转换为逗号分隔的字符串
|
|
|
|
|
@ -195,7 +195,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
|
.distinct() |
|
|
|
|
.collect(Collectors.joining(",")); |
|
|
|
|
|
|
|
|
|
// 4. 批量查询用户信息(一次远程调用)
|
|
|
|
|
// 4. 批量查询用户信息
|
|
|
|
|
Map<Long, String> userNameMap = new HashMap<>(); |
|
|
|
|
if (StringUtils.isNotBlank(userIdsStr)) { |
|
|
|
|
try { |
|
|
|
|
|