|
@@ -212,19 +212,17 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
|
|
|
if(CollectionUtil.isEmpty(requestDTO.getIds())){
|
|
if(CollectionUtil.isEmpty(requestDTO.getIds())){
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- if(StringUtils.isNotEmpty(requestDTO.getRemoveUser())){
|
|
|
|
|
|
|
+ if(StringUtils.isEmpty(requestDTO.getRemoveUser())){
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
Collection<BusPumpEntity> pumps = this.list(new LambdaQueryWrapper<BusPumpEntity>()
|
|
Collection<BusPumpEntity> pumps = this.list(new LambdaQueryWrapper<BusPumpEntity>()
|
|
|
.in(BusPumpEntity::getId,requestDTO.getIds()));
|
|
.in(BusPumpEntity::getId,requestDTO.getIds()));
|
|
|
- List<BusPumpEntity> collect = pumps.stream()
|
|
|
|
|
- .peek(p -> p.setRemoveUser(requestDTO.getRemoveUser())).collect(Collectors.toList());
|
|
|
|
|
- this.updateBatchById(collect);
|
|
|
|
|
|
|
|
|
|
if(CollectionUtil.isEmpty(pumps)){
|
|
if(CollectionUtil.isEmpty(pumps)){
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- Map<String, List<BusPumpEntity>> pumpMap = collect.stream()
|
|
|
|
|
|
|
+ Map<String, List<BusPumpEntity>> pumpMap = pumps.stream()
|
|
|
|
|
+ .peek(p->p.setRemoveUser(requestDTO.getRemoveUser()))
|
|
|
.peek(p -> p.setIsRemove(Boolean.FALSE))
|
|
.peek(p -> p.setIsRemove(Boolean.FALSE))
|
|
|
.collect(Collectors.groupingBy(BusPumpEntity::getHospitalCode));
|
|
.collect(Collectors.groupingBy(BusPumpEntity::getHospitalCode));
|
|
|
|
|
|