|
@@ -88,6 +88,8 @@ public class KwpSettlementOfflineService {
|
|
|
if (CollectionUtils.isEmpty(settlementOfflineLogisticsList)) {
|
|
if (CollectionUtils.isEmpty(settlementOfflineLogisticsList)) {
|
|
|
return new PageRes<>(new PageInfo<>());
|
|
return new PageRes<>(new PageInfo<>());
|
|
|
}
|
|
}
|
|
|
|
|
+ PageInfo<SettlementOfflineDto> pageInfo = new PageInfo<>(settlementOfflineLogisticsList);
|
|
|
|
|
+
|
|
|
//增加对应创建人和更新人名称
|
|
//增加对应创建人和更新人名称
|
|
|
for (SettlementOfflineDto entity : settlementOfflineLogisticsList) {
|
|
for (SettlementOfflineDto entity : settlementOfflineLogisticsList) {
|
|
|
entity.setCreateByText("创建人名称");
|
|
entity.setCreateByText("创建人名称");
|
|
@@ -123,7 +125,7 @@ public class KwpSettlementOfflineService {
|
|
|
return settlementOfflineVo;
|
|
return settlementOfflineVo;
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
|
|
- return new PageRes<>(new PageInfo<>(collect));
|
|
|
|
|
|
|
+ return PageRes.build(pageInfo, collect);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -271,6 +273,7 @@ public class KwpSettlementOfflineService {
|
|
|
}
|
|
}
|
|
|
Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
|
|
Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
|
|
|
DecimalFormat df = new DecimalFormat("0.00");
|
|
DecimalFormat df = new DecimalFormat("0.00");
|
|
|
|
|
+ PageInfo<SettlementOfflineDto> pageInfo = new PageInfo<>(settlementOfflineDto);
|
|
|
//指定返回值
|
|
//指定返回值
|
|
|
List<SettlementOfflineVo> collect = settlementOfflineDto.stream().map(a -> {
|
|
List<SettlementOfflineVo> collect = settlementOfflineDto.stream().map(a -> {
|
|
|
SettlementOfflineVo settlementOfflineVo = new SettlementOfflineVo();
|
|
SettlementOfflineVo settlementOfflineVo = new SettlementOfflineVo();
|
|
@@ -299,7 +302,7 @@ public class KwpSettlementOfflineService {
|
|
|
settlementOfflineVo.setTopayPrice(df.format(Objects.isNull(a.getTopayPrice()) ? new BigDecimal("0.0") : a.getTopayPrice()));
|
|
settlementOfflineVo.setTopayPrice(df.format(Objects.isNull(a.getTopayPrice()) ? new BigDecimal("0.0") : a.getTopayPrice()));
|
|
|
return settlementOfflineVo;
|
|
return settlementOfflineVo;
|
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
- return new PageRes<>(new PageInfo<>(collect));
|
|
|
|
|
|
|
+ return PageRes.build(pageInfo, collect);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|