|
|
|
@@ -1,6 +1,5 @@ |
|
|
|
package com.iformall.service.impl; |
|
|
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
@@ -227,28 +226,15 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
.parallelStream() |
|
|
|
.collect(Collectors.groupingBy(WxBillAllVo::getMerchantId)); |
|
|
|
|
|
|
|
List<Map<String, Object>> list = new ArrayList<>(); |
|
|
|
|
|
|
|
Iterator<Map.Entry<Long, List<WxBillAllVo>>> entries = billMapList.entrySet().iterator(); |
|
|
|
while (entries.hasNext()) { |
|
|
|
Map.Entry<Long, List<WxBillAllVo>> entry = entries.next(); |
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
ExportParams deptExportParams = new ExportParams(); |
|
|
|
WxBillAllVo first = ((List<WxBillAllVo>)(entry.getValue())).get(0); |
|
|
|
deptExportParams.setSheetName(first.getMerchantName()); |
|
|
|
deptExportParams.setTitle(first.getMerchantName() |
|
|
|
+ " (" |
|
|
|
+ EnumRentShopType.getEnum((Integer)first.getRentShopType()).getMessage() |
|
|
|
+ "-"+first.getShopNumber() |
|
|
|
+ ")"); |
|
|
|
//deptExportParams.setSecondTitle(); |
|
|
|
map.put("title", deptExportParams); |
|
|
|
map.put("entity", WxBillAllVo.class); |
|
|
|
map.put("data", entry.getValue()); |
|
|
|
list.add(map); |
|
|
|
} |
|
|
|
|
|
|
|
excelService.exportExcel(list, "账单数据.xls", response); |
|
|
|
List<WxBillAllVo> list = new ArrayList<>(); |
|
|
|
|
|
|
|
Set<Map.Entry<Long, List<WxBillAllVo>>> entries = billMapList.entrySet(); |
|
|
|
for (Map.Entry<Long, List<WxBillAllVo>> entry : entries) { |
|
|
|
list.add(new WxBillAllVo()); |
|
|
|
list.addAll(entry.getValue()); |
|
|
|
} |
|
|
|
|
|
|
|
excelService.exportExcel(list, null, "账单数据", WxBillAllVo.class, "账单数据.xlsx", response); |
|
|
|
} |
|
|
|
|
|
|
|
private int updateBillOtherDeposit(Map<String, Object> bill) { |
|
|
|
|