|
|
|
@ -48,6 +48,7 @@ import org.springframework.web.multipart.MultipartFile; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
import java.util.Set; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
@ -104,9 +105,20 @@ public class PlatingController extends BladeController { |
|
|
|
qw.orderByAsc(BaseCol.ID); |
|
|
|
qw.orderByAsc(BaseCol.ID); |
|
|
|
IPage<Plating> pages = service.page(Condition.getPage(query), qw); |
|
|
|
IPage<Plating> pages = service.page(Condition.getPage(query), qw); |
|
|
|
IPage<PlatingVO> pagesVO = PlatingWrapper.build().pageVO(pages); |
|
|
|
IPage<PlatingVO> pagesVO = PlatingWrapper.build().pageVO(pages); |
|
|
|
|
|
|
|
//bcId
|
|
|
|
|
|
|
|
//镀种ID , 镀种名称
|
|
|
|
|
|
|
|
Set<Long> bcIds = pagesVO.getRecords().stream().map(PlatingVO::getBcId).collect(Collectors.toSet()); |
|
|
|
|
|
|
|
Map<Long, String> bcIdAndName = basicClazzService |
|
|
|
|
|
|
|
.listByIds(bcIds) |
|
|
|
|
|
|
|
.stream() |
|
|
|
|
|
|
|
.collect(Collectors.toMap(BasicClazz::getId, BasicClazz::getName)); |
|
|
|
|
|
|
|
//basicClazzService
|
|
|
|
pagesVO.getRecords() |
|
|
|
pagesVO.getRecords() |
|
|
|
.stream() |
|
|
|
.stream() |
|
|
|
.peek(service::setVOValue) |
|
|
|
.peek( s -> { |
|
|
|
|
|
|
|
s.setBcName(bcIdAndName.getOrDefault(s.getBcId(), "-1")); |
|
|
|
|
|
|
|
service.setVOValue(s); |
|
|
|
|
|
|
|
}) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
.collect(Collectors.toList()); |
|
|
|
return R.data(pagesVO); |
|
|
|
return R.data(pagesVO); |
|
|
|
} |
|
|
|
} |
|
|
|
|