Commit bf67c6d1b399ae690fb4c1371d6efa53da12e076
1 parent
5732f62a57
Exists in
master
and in
6 other branches
优惠券统计列表加个孕妇户籍地址，上面搜索项也要增加一个(打印)
Showing 1 changed file with 7 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java
View file @
bf67c6d
| ... | ... | @@ -60,12 +60,18 @@ |
| 60 | 60 | @TokenRequired |
| 61 | 61 | @RequestMapping(value = "/coupon/info/export", method = RequestMethod.GET) |
| 62 | 62 | public void couponInfoExport(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, Integer type, |
| 63 | - String couponType, Integer exportType, String doctor, String key) { | |
| 63 | + String couponType, Integer exportType, String doctor, String key, | |
| 64 | + Integer provinceId, Integer cityId, Integer areaId, Integer streetId) { | |
| 64 | 65 | |
| 65 | 66 | String hospitalId = autoMatchFacade.getHospitalId(getUserId(request)); |
| 66 | 67 | Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, |
| 67 | 68 | "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "type", 4, |
| 68 | 69 | "couponType", couponType, "exportType", exportType, "doctor", doctor, "key", key); |
| 70 | + //隆化居住地筛选参数 | |
| 71 | + param.put("provinceId", provinceId); | |
| 72 | + param.put("cityId", cityId); | |
| 73 | + param.put("areaId", areaId); | |
| 74 | + param.put("streetId", streetId); | |
| 69 | 75 | orgCouponService.exportCouponInfo(param, response); |
| 70 | 76 | } |
| 71 | 77 |