From df582c4c9f2afffe6d18fa6571c16d7bdd20d871 Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 9 Jun 2017 18:26:58 +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 --- .../com/lyms/platform/operate/web/controller/ReportController.java | 6 +++--- .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index b5f19c1..d98d7dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -255,12 +255,12 @@ public class ReportController extends BaseController { * @param couponType */ @ResponseBody - @TokenRequired +// @TokenRequired @RequestMapping(value = "/coupon/info/export", method = RequestMethod.GET) public void couponInfoExport(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, Integer type, String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, Integer exportType) { -// Map param = CollectionUtils.createMap("userId", "1000000185", "startDate", startDate, - Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, + Map param = CollectionUtils.createMap("userId", "1000000185", "startDate", startDate, +// Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, "tempId", tempId, "couponType",couponType, "exportType", exportType); reportService.exportCouponInfo(param, response); 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 44887d1..25ff4ac 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 @@ -1039,14 +1039,15 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService * 1 = 发放人数 2 = 发放券数 3 = 使用人数 4 = 使用券数 */ Integer type = (Integer) param.get("type"); + if(type == null) type = 1; if(exportType == 1 && type == 1) { /** 孕期发放人数 */ exportPregnancy(userSendInfos, response); } else if(exportType == 1) { /** 孕期使用券数 */ exportPregnancyUsedInfo(couponInfos, response); } else if(exportType == 2 && type == 1) { /** 产后发放统计 */ - exportPostpartumSendInfo(userSendInfos, response); + exportPostpartumSendInfo(couponInfos, response); } else if(exportType == 2) { /** 产后使用 */ - exportPostpartumUsedInfo(userSendInfos, response); + exportPostpartumUsedInfo(couponInfos, response); } else if(exportType == 3 && type == 1) {/** 儿童发放 */ exportChildSendInfo(userSendInfos, response); } else if(exportType == 3) {/** 儿童使用 */ -- 1.8.3.1