|
|
@@ -188,11 +188,15 @@ public class KwoTransportDemandService {
|
|
|
List<TransportDemandListRes> result = Lists.newArrayList();
|
|
|
list.forEach(e -> {
|
|
|
TransportDemandListRes demand = BeanUtils.copyProperties(e, TransportDemandListRes.class);
|
|
|
+ String loadAreaName = Objects.nonNull(e.getLoadAreaName()) ? e.getLoadAreaName() : "";
|
|
|
+ String loadDetailAddress = Objects.nonNull(e.getLoadDetailAddress()) ? e.getLoadDetailAddress() : "";
|
|
|
+ String unloadAreaName = Objects.nonNull(e.getUnloadAreaName()) ? e.getUnloadAreaName() : "";
|
|
|
+ String unloadDetailAddress = Objects.nonNull(e.getUnloadDetailAddress()) ? e.getUnloadDetailAddress() : "";
|
|
|
demand.setGoodsTypeLabel(DictEnum.getLabel(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), e.getGoodsType()))
|
|
|
.setTradingLabel(DictEnum.getLabel(DictTypeEnum.TRADE_TYPE.getType(), e.getTrading()))
|
|
|
.setStatusLabel(DictEnum.getLabel(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType(), String.valueOf(e.getStatus())))
|
|
|
- .setLoadAddress(e.getLoadAreaName() + e.getLoadDetailAddress())
|
|
|
- .setUnloadAddress(e.getUnloadAreaName() + e.getUnloadDetailAddress());
|
|
|
+ .setLoadAddress(loadAreaName + loadDetailAddress)
|
|
|
+ .setUnloadAddress(unloadAreaName + unloadDetailAddress);
|
|
|
result.add(demand);
|
|
|
});
|
|
|
return PageResult.build(param.getPage(), param.getPageSize(), demandPage.getTotal(), result);
|