|
@@ -325,6 +325,18 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
List<SalesOrder> orders = salesOrderMapper.selectList((new QueryWrapper<SalesOrder>().eq("custom_id", custom1.getId())));
|
|
|
if (orders.size() > 0 ){
|
|
|
List<Integer> tids = orders.stream().map(SalesOrder::getType).collect(Collectors.toList());
|
|
|
+ List<String> ids = orders.stream()
|
|
|
+ .flatMap(order -> Stream.of(order.getInchargerId(), order.getCreatorId()))
|
|
|
+ .filter(Objects::nonNull)
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", ids));
|
|
|
+ Map<String, String> map1 = users.stream()
|
|
|
+ .collect(Collectors.toMap(User::getId,User::getName));
|
|
|
+ for (SalesOrder contact : orders) {
|
|
|
+ contact.setInchargerName(map1.get(contact.getInchargerId()));
|
|
|
+ contact.setCreatorName(map1.get(contact.getCreatorId()));
|
|
|
+ }
|
|
|
List<SysDict> sysDicts = sysDictMapper.selectList(new QueryWrapper<SysDict>().eq("code", "OrderType").in("id", tids));
|
|
|
Map<Integer, String> map = sysDicts.stream()
|
|
|
.collect(Collectors.toMap(SysDict::getId, SysDict::getName));
|