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); } }