From 71faf06b47c62773c797dabcd2c1d3482b15cfcc Mon Sep 17 00:00:00 2001 From: litao Date: Thu, 1 Jun 2017 18:09:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/ReportController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 5a35bab..1f59c29 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 @@ -208,9 +208,10 @@ public class ReportController extends BaseController { @RequestMapping(value = "/coupon", method = RequestMethod.GET) public BaseObjectResponse coupon(HttpServletRequest request, Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType) { - Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, + /*Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", - areaId, "tempId", tempId, "couponType", couponType); + areaId, "tempId", tempId, "couponType", couponType);*/ + Map param = CollectionUtils.createMap("userId", getUserId(request),"hospitalId", hospitalId,"tempId", tempId, "couponType", "1,2,3,4,5,6,7,8"); return reportService.coupon(param); } @@ -234,9 +235,11 @@ public class ReportController extends BaseController { public BaseObjectResponse couponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type, String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, Integer page, Integer limit) { - Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, + /* Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, - "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit); + "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit);*/ + Map param = CollectionUtils.createMap("userId", getUserId(request), "hospitalId", hospitalId, "type", type, + "tempId", tempId, "couponType", CollectionUtils.asList("1,2,3,4,5,6,7,8"), "currentPage", page, "pageSize", limit); return reportService.couponInfo(param); } -- 1.8.3.1