Commit df582c4c9f2afffe6d18fa6571c16d7bdd20d871
1 parent
c906a895f1
Exists in
master
and in
6 other branches
导出
Showing 2 changed files with 6 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
View file @
df582c4
| ... | ... | @@ -255,12 +255,12 @@ |
| 255 | 255 | * @param couponType |
| 256 | 256 | */ |
| 257 | 257 | @ResponseBody |
| 258 | - @TokenRequired | |
| 258 | +// @TokenRequired | |
| 259 | 259 | @RequestMapping(value = "/coupon/info/export", method = RequestMethod.GET) |
| 260 | 260 | public void couponInfoExport(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, Integer type, |
| 261 | 261 | String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, Integer exportType) { |
| 262 | -// Map<String, Object> param = CollectionUtils.createMap("userId", "1000000185", "startDate", startDate, | |
| 263 | - Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, | |
| 262 | + Map<String, Object> param = CollectionUtils.createMap("userId", "1000000185", "startDate", startDate, | |
| 263 | +// Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, | |
| 264 | 264 | "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, |
| 265 | 265 | "tempId", tempId, "couponType",couponType, "exportType", exportType); |
| 266 | 266 | reportService.exportCouponInfo(param, response); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
df582c4
| ... | ... | @@ -1039,14 +1039,15 @@ |
| 1039 | 1039 | * 1 = 发放人数 2 = 发放券数 3 = 使用人数 4 = 使用券数 |
| 1040 | 1040 | */ |
| 1041 | 1041 | Integer type = (Integer) param.get("type"); |
| 1042 | + if(type == null) type = 1; | |
| 1042 | 1043 | if(exportType == 1 && type == 1) { /** 孕期发放人数 */ |
| 1043 | 1044 | exportPregnancy(userSendInfos, response); |
| 1044 | 1045 | } else if(exportType == 1) { /** 孕期使用券数 */ |
| 1045 | 1046 | exportPregnancyUsedInfo(couponInfos, response); |
| 1046 | 1047 | } else if(exportType == 2 && type == 1) { /** 产后发放统计 */ |
| 1047 | - exportPostpartumSendInfo(userSendInfos, response); | |
| 1048 | + exportPostpartumSendInfo(couponInfos, response); | |
| 1048 | 1049 | } else if(exportType == 2) { /** 产后使用 */ |
| 1049 | - exportPostpartumUsedInfo(userSendInfos, response); | |
| 1050 | + exportPostpartumUsedInfo(couponInfos, response); | |
| 1050 | 1051 | } else if(exportType == 3 && type == 1) {/** 儿童发放 */ |
| 1051 | 1052 | exportChildSendInfo(userSendInfos, response); |
| 1052 | 1053 | } else if(exportType == 3) {/** 儿童使用 */ |