Commit fa8781107c7593f2c1285d21afd7089068f9a739
1 parent
df582c4c9f
Exists in
master
and in
6 other branches
导出
Showing 1 changed file with 6 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
fa87811
| ... | ... | @@ -1041,17 +1041,17 @@ |
| 1041 | 1041 | Integer type = (Integer) param.get("type"); |
| 1042 | 1042 | if(type == null) type = 1; |
| 1043 | 1043 | if(exportType == 1 && type == 1) { /** 孕期发放人数 */ |
| 1044 | - exportPregnancy(userSendInfos, response); | |
| 1044 | + exportPregnancy(couponInfos == null ? userSendInfos : couponInfos, response); | |
| 1045 | 1045 | } else if(exportType == 1) { /** 孕期使用券数 */ |
| 1046 | - exportPregnancyUsedInfo(couponInfos, response); | |
| 1046 | + exportPregnancyUsedInfo(couponInfos == null ? userSendInfos : couponInfos, response); | |
| 1047 | 1047 | } else if(exportType == 2 && type == 1) { /** 产后发放统计 */ |
| 1048 | - exportPostpartumSendInfo(couponInfos, response); | |
| 1048 | + exportPostpartumSendInfo(couponInfos == null ? userSendInfos : couponInfos, response); | |
| 1049 | 1049 | } else if(exportType == 2) { /** 产后使用 */ |
| 1050 | - exportPostpartumUsedInfo(couponInfos, response); | |
| 1050 | + exportPostpartumUsedInfo(couponInfos == null ? userSendInfos : couponInfos, response); | |
| 1051 | 1051 | } else if(exportType == 3 && type == 1) {/** 儿童发放 */ |
| 1052 | - exportChildSendInfo(userSendInfos, response); | |
| 1052 | + exportChildSendInfo(couponInfos == null ? userSendInfos : couponInfos, response); | |
| 1053 | 1053 | } else if(exportType == 3) {/** 儿童使用 */ |
| 1054 | - exportChildUsedInfo(userSendInfos, response); | |
| 1054 | + exportChildUsedInfo(couponInfos == null ? userSendInfos : couponInfos, response); | |
| 1055 | 1055 | } |
| 1056 | 1056 | |
| 1057 | 1057 | } |