From ca10c7824f1dcfbb4cc973efe46952d7181b35ce Mon Sep 17 00:00:00 2001 From: litao Date: Wed, 31 May 2017 10:29:29 +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 --- .../lyms/platform/operate/web/controller/ReportController.java | 9 +++++---- 1 file changed, 5 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 91e467e..5a35bab 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 @@ -225,17 +225,18 @@ public class ReportController extends BaseController { * @param hospitalId 医院id * @param tempId 模板id * @param couponType 优惠券类型 + * @param type 查询类型 1 = 发放人数 2 = 发放券数 3 = 使用人数 4 = 使用券数 * @return */ @ResponseBody @TokenRequired @RequestMapping(value = "/coupon/info", method = RequestMethod.GET) - public BaseObjectResponse couponInfo(HttpServletRequest request, Date startDate, Date endDate, + public BaseObjectResponse couponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type, String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, - Integer currentPage, Integer pageSize) { + Integer page, Integer limit) { Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, - "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", - areaId, "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", currentPage, "pageSize", pageSize); + "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, + "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit); return reportService.couponInfo(param); } -- 1.8.3.1