|
|
|
@ -228,20 +228,20 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
|
@Override
|
|
|
|
|
public List<TaskDispatchDetailDO> getTaskDispatchDetailListByDispatchId(Long dispatchId) {
|
|
|
|
|
List<TaskDispatchDetailDO> result = taskDispatchDetailMapper.selectListByDispatchId(dispatchId);
|
|
|
|
|
result.forEach(map ->{
|
|
|
|
|
List<Long> ids = new ArrayList<>();
|
|
|
|
|
List<String> names = new ArrayList<>();
|
|
|
|
|
if(map.getOwnerIds() != null){
|
|
|
|
|
Arrays.stream(map.getOwnerIds().split(",")).forEach(item ->{
|
|
|
|
|
ids.add(Long.parseLong(item.trim()));
|
|
|
|
|
names.add(adminUserMapper.selectById(Long.parseLong(item.trim())).getNickname());
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
map.setOwners(ids);
|
|
|
|
|
map.setOwnerNames(names);
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
// result.forEach(map ->{
|
|
|
|
|
// List<Long> ids = new ArrayList<>();
|
|
|
|
|
// List<String> names = new ArrayList<>();
|
|
|
|
|
// if(map.getOwnerIds() != null){
|
|
|
|
|
// Arrays.stream(map.getOwnerIds().split(",")).forEach(item ->{
|
|
|
|
|
// ids.add(Long.parseLong(item.trim()));
|
|
|
|
|
// names.add(adminUserMapper.selectById(Long.parseLong(item.trim())).getNickname());
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// map.setOwners(ids);
|
|
|
|
|
// map.setOwnerNames(names);
|
|
|
|
|
//
|
|
|
|
|
// });
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -397,7 +397,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
|
|
|
|
private void createTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailDO> list) {
|
|
|
|
|
list.forEach(o -> {
|
|
|
|
|
o.setDispatchId(dispatchId);
|
|
|
|
|
o.setOwnerIds(o.getOwners().toString().replace("[","").replace("]",""));
|
|
|
|
|
// o.setOwnerIds(o.getOwners().toString().replace("[","").replace("]",""));
|
|
|
|
|
});
|
|
|
|
|
// 分组更新与插入
|
|
|
|
|
List<TaskDispatchDetailDO> updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList());
|
|
|
|
|