|
@@ -76,7 +76,7 @@ public class MonthlyReconciliationController extends BaseController {
|
|
|
// 分页查询
|
|
|
IPage<MonthlyReconciliation> page = monthlyReconciliationService.queryPage(vo);
|
|
|
// 采购服务站名称
|
|
|
- List<SysDictData> data = dictTypeService.selectDictDataByType("purchase_services");
|
|
|
+ List<SysDictData> services = dictTypeService.selectDictDataByType("purchase_services");
|
|
|
if (!ObjectUtils.isEmpty(page.getRecords()) && page.getRecords().size() > 0) {
|
|
|
page.setRecords(page.getRecords().stream().map(dto -> {
|
|
|
// 采购单位名称
|
|
@@ -95,9 +95,9 @@ public class MonthlyReconciliationController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
// 采购服务站名称
|
|
|
- if (!ObjectUtils.isEmpty(data)) {
|
|
|
- List<SysDictData> collect = data.stream()
|
|
|
- .filter(d -> d.getDictValue().equals(vo.getPurchaseServices())).collect(Collectors.toList());
|
|
|
+ if (!ObjectUtils.isEmpty(services)) {
|
|
|
+ List<SysDictData> collect = services.stream()
|
|
|
+ .filter(d -> d.getDictValue().equals(dto.getPurchaseServices())).collect(Collectors.toList());
|
|
|
if (!ObjectUtils.isEmpty(collect)) {
|
|
|
dto.setPurchaseServicesName(collect.get(0).getDictLabel());
|
|
|
}
|