Browse Source

[账单总览][修改][导出时过滤merchantId为空数据]

release_toaliyun_real
gongbiao 6 years ago
parent
commit
ad3d9fbda6
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java View File

@@ -311,7 +311,8 @@ public class WxBillAllServiceImpl implements WxBillAllService {
@Override @Override
public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll) { public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll) {


Map<Long, List<WxBillAllVo>> collect = wxBillAllMapper.list(wxBillAll).parallelStream()
Map<Long, List<WxBillAllVo>> collect = wxBillAllMapper.list(wxBillAll)
.stream().filter(b -> null != b.getMerchantId())
.collect(Collectors.groupingBy(WxBillAllVo::getMerchantId)); .collect(Collectors.groupingBy(WxBillAllVo::getMerchantId));
Set<Map.Entry<Long, List<WxBillAllVo>>> entries = collect.entrySet(); Set<Map.Entry<Long, List<WxBillAllVo>>> entries = collect.entrySet();
List<WxBillAllVo> datalist = new ArrayList<>(); List<WxBillAllVo> datalist = new ArrayList<>();


Loading…
Cancel
Save