Commit cf769d8ba38aef7e1b09df24af90202f7913acd7
1 parent
9536944449
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 11 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
cf769d8
| ... | ... | @@ -3137,8 +3137,9 @@ |
| 3137 | 3137 | //秦皇岛年龄筛选 <35 岁(大于等于35需要移除，这里需要重新组装数据) |
| 3138 | 3138 | List<Map<String, Object>> couponInfo2=new ArrayList<>(); |
| 3139 | 3139 | if(null!=param.get("age")) { |
| 3140 | - param.put("needPage", false); | |
| 3141 | - couponInfo2=couponMapper.couponInfo2(param); | |
| 3140 | + Map<String,Object> param2=param; | |
| 3141 | + param2.put("needPage",false); | |
| 3142 | + couponInfo2=couponMapper.couponInfo2(param2); | |
| 3142 | 3143 | Iterator<Map<String, Object>> iterator = couponInfo2.iterator(); |
| 3143 | 3144 | while (iterator .hasNext()) { |
| 3144 | 3145 | Map<String, Object> map= iterator.next(); |
| 3145 | 3146 | |
| ... | ... | @@ -3149,13 +3150,17 @@ |
| 3149 | 3150 | if (age >= 35) { |
| 3150 | 3151 | iterator.remove(); |
| 3151 | 3152 | } |
| 3152 | - if(age<35){ | |
| 3153 | - System.out.println(personModel.getId()); | |
| 3154 | - } | |
| 3155 | 3153 | } |
| 3156 | 3154 | } |
| 3157 | 3155 | } |
| 3158 | - couponInfos = CollectionUtils.getPageIds(couponInfo2, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize")); | |
| 3156 | + boolean needpage = (Boolean) param.get("needPage"); | |
| 3157 | + if (needpage) { | |
| 3158 | + couponInfos = CollectionUtils.getPageIds(couponInfo2, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize")); | |
| 3159 | + }else {//导出用 | |
| 3160 | + couponInfos=couponInfo2; | |
| 3161 | + } | |
| 3162 | + | |
| 3163 | + | |
| 3159 | 3164 | } |
| 3160 | 3165 | String subTitle = null; |
| 3161 | 3166 | Set<String> subTitleTempSet = new HashSet<>(); |