From fa8781107c7593f2c1285d21afd7089068f9a739 Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 9 Jun 2017 18:35:17 +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 --- .../platform/operate/web/service/impl/ReportServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 25ff4ac..c4d3282 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 @@ -1041,17 +1041,17 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Integer type = (Integer) param.get("type"); if(type == null) type = 1; if(exportType == 1 && type == 1) { /** 孕期发放人数 */ - exportPregnancy(userSendInfos, response); + exportPregnancy(couponInfos == null ? userSendInfos : couponInfos, response); } else if(exportType == 1) { /** 孕期使用券数 */ - exportPregnancyUsedInfo(couponInfos, response); + exportPregnancyUsedInfo(couponInfos == null ? userSendInfos : couponInfos, response); } else if(exportType == 2 && type == 1) { /** 产后发放统计 */ - exportPostpartumSendInfo(couponInfos, response); + exportPostpartumSendInfo(couponInfos == null ? userSendInfos : couponInfos, response); } else if(exportType == 2) { /** 产后使用 */ - exportPostpartumUsedInfo(couponInfos, response); + exportPostpartumUsedInfo(couponInfos == null ? userSendInfos : couponInfos, response); } else if(exportType == 3 && type == 1) {/** 儿童发放 */ - exportChildSendInfo(userSendInfos, response); + exportChildSendInfo(couponInfos == null ? userSendInfos : couponInfos, response); } else if(exportType == 3) {/** 儿童使用 */ - exportChildUsedInfo(userSendInfos, response); + exportChildUsedInfo(couponInfos == null ? userSendInfos : couponInfos, response); } } -- 1.8.3.1