From c906a895f1b9411502d5b58de5fe2995b51f0540 Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 9 Jun 2017 18:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 1861581..44887d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -1019,6 +1019,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public void exportCouponInfo(Map param, HttpServletResponse response) { param.put("needPage", false); + BaseObjectResponse resp = couponInfo(param); PageResult pageResult = (PageResult) resp.getData(); Map map = (Map) pageResult.getGrid(); @@ -1040,15 +1041,15 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Integer type = (Integer) param.get("type"); if(exportType == 1 && type == 1) { /** 孕期发放人数 */ exportPregnancy(userSendInfos, response); - } else if(exportType == 1 && type == 4) { /** 孕期使用券数 */ + } else if(exportType == 1) { /** 孕期使用券数 */ exportPregnancyUsedInfo(couponInfos, response); } else if(exportType == 2 && type == 1) { /** 产后发放统计 */ exportPostpartumSendInfo(userSendInfos, response); - } else if(exportType == 2 && type == 4) { /** 产后使用 */ + } else if(exportType == 2) { /** 产后使用 */ exportPostpartumUsedInfo(userSendInfos, response); } else if(exportType == 3 && type == 1) {/** 儿童发放 */ exportChildSendInfo(userSendInfos, response); - } else if(exportType == 3 && type == 4) {/** 儿童使用 */ + } else if(exportType == 3) {/** 儿童使用 */ exportChildUsedInfo(userSendInfos, response); } -- 1.8.3.1