|
|
@@ -1532,7 +1532,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
public Map<String, Object> getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { |
|
|
public Map<String, Object> getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { |
|
|
PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getReceiveAndPayBillAsPage(record)); |
|
|
PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getReceiveAndPayBillAsPage(record)); |
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
initBalance(pageInfo.getList()); |
|
|
|
|
|
result.put("pageInfo", pageInfo); |
|
|
result.put("pageInfo", pageInfo); |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
@@ -1572,25 +1571,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); |
|
|
excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public void initBalance(List<Map<String, Object>> data){ |
|
|
|
|
|
data.stream().forEach(e ->{ |
|
|
|
|
|
if(e.get("receivePay")==null){ |
|
|
|
|
|
e.put("receivePay",0); |
|
|
|
|
|
} |
|
|
|
|
|
if(e.get("payOut")==null){ |
|
|
|
|
|
e.put("payOut",0); |
|
|
|
|
|
} |
|
|
|
|
|
BigDecimal r = new BigDecimal(e.get("receivePay")==null?"0":e.get("receivePay").toString()); |
|
|
|
|
|
BigDecimal p = new BigDecimal(e.get("payOut")==null?"0":e.get("payOut").toString()); |
|
|
|
|
|
e.put("balance",r.subtract(p)); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { |
|
|
public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { |
|
|
List<Map<String, Object>> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); |
|
|
List<Map<String, Object>> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); |
|
|
initBalance(data); |
|
|
|
|
|
|
|
|
|
|
|
List<ReceivedAndPayVo> list = new ArrayList<>(); |
|
|
List<ReceivedAndPayVo> list = new ArrayList<>(); |
|
|
for (Map<String, Object> map : data) { |
|
|
for (Map<String, Object> map : data) { |
|
|
ReceivedAndPayVo oweMerchantVo = new ReceivedAndPayVo(); |
|
|
ReceivedAndPayVo oweMerchantVo = new ReceivedAndPayVo(); |
|
|
|