From 6a8ab4b5fb99466b88d0a0beeaa86cded1cfeda7 Mon Sep 17 00:00:00 2001
From: gongbiao <gongbiao>
Date: Wed, 15 May 2019 17:56:55 +0800
Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=88=97=E8=A1=A8][?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9[=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/iformall/domain/vo/WxBillAllVo.java   |  8 +++---
 .../service/impl/WxBillAllServiceImpl.java    | 28 -------------------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
index a5a257c6f..073b57599 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
@@ -17,13 +17,13 @@ public class WxBillAllVo {
 
     private Long shopId;
 
-    //@Excel(name="商铺号",width = 20,orderNum = "1")
+    @Excel(name = "商铺号", width = 20, orderNum = "1")
     private String shopNumber;
 
-    //@Excel(name="商户名称",width = 20,orderNum = "2")
+    @Excel(name = "商户名称", width = 20, orderNum = "2")
     private String merchantName;
 
-    //@Excel(name="商铺类型",width = 20,orderNum = "3", replace = {"店铺_1","多经点位_2"})
+    @Excel(name = "商铺类型", width = 20, orderNum = "3", replace = {"店铺_1", "多经点位_2"})
     private Integer rentShopType;
 
     @Excel(name="费用类型",width = 20,orderNum = "4")
@@ -44,7 +44,7 @@ public class WxBillAllVo {
     @Excel(name="逾期天数",width = 20,orderNum = "9")
     private Integer expiredDay;
 
-    @Excel(name="账单状态",width = 20,orderNum = "10", replace = {"欠缴_1","待缴_2","已结清_3","未到期_4","已退还_5","失效_6"})
+    @Excel(name = "账单状态", width = 20, orderNum = "10", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "_7"})
     private Integer status;
 
     private Integer billTypeValue;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
index 019848b75..af46b3d71 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
@@ -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;
@@ -28,7 +27,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author gongbiao
@@ -222,32 +220,6 @@ public class WxBillAllServiceImpl implements WxBillAllService {
     @Override
     public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll) {
 
-        Map<Long, List<WxBillAllVo>> billMapList = wxBillAllMapper.list(wxBillAll)
-                .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);
     }
 
     private int updateBillOtherDeposit(Map<String, Object> bill) {