From ad5afc6649a3769b320c829b35074d9e0b9ea56f Mon Sep 17 00:00:00 2001 From: litao Date: Tue, 6 Jun 2017 10:32:57 +0800 Subject: [PATCH] bug xiufu --- .../web/service/impl/ReportServiceImpl.java | 34 +++++++++++----------- .../operate/web/utils/CollectionUtils.java | 10 +++++-- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 07c6fea..75abc80 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -452,7 +452,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(org.apache.commons.collections.CollectionUtils.isNotEmpty(couponReport) && org.apache.commons.collections.CollectionUtils.isNotEmpty(usedInfo)) { - if(CollectionUtils.putAll(couponReport, usedInfo, "create_hospital_id", "used_hospital_id")) { + if(CollectionUtils.putAll(couponReport, usedInfo, "used_hospital_id", "used_hospital_id")) { for (Map map : couponReport) { map.put("province_name", findName(map.get("province_id"))); map.put("city_name", findName(map.get("city_id"))); @@ -462,7 +462,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService xAxis.add(areaName); } } else{ - return RespBuilder.buildErro(ResponseCode.DATA_ERROR); +// return RespBuilder.buildErro(ResponseCode.DATA_ERROR); } } @@ -491,23 +491,23 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService private List createSeries(List> couponReport) { - List seriesList = new ArrayList<>(); + Series couponSendCount = new Series(); + couponSendCount.setName("发放券数"); + couponSendCount.setType("bar"); + couponSendCount.setData(new ArrayList<>()); + + Series peopleUsedCount = new Series(); + peopleUsedCount.setName("使用券数"); + peopleUsedCount.setType("bar"); + peopleUsedCount.setData(new ArrayList<>()); + for (Map coupon : couponReport) { - /** 设置发放券数 */ - Series series = new Series(); - series.setName("发放券数"); - series.setType("bar"); - series.setData(Arrays.asList(coupon.get("coupon_send_count"))); - seriesList.add(series); - - /** 设置使用券数 */ - Series s = new Series(); - s.setName("使用券数"); - s.setType("bar"); - s.setData(Arrays.asList(coupon.get("people_send_count"))); - seriesList.add(s); + Object coupon_send_count = coupon.get("coupon_send_count"); + couponSendCount.getData().add(coupon_send_count == null ? 0 : coupon_send_count); + Object coupon_used_count = coupon.get("coupon_used_count"); + peopleUsedCount.getData().add(coupon_used_count == null ? 0: coupon_used_count); } - return seriesList; + return Arrays.asList(couponSendCount, peopleUsedCount); } @Override diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java index dc1b8e2..55bd1dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java @@ -52,9 +52,13 @@ public class CollectionUtils { boolean modified = false; for (Map mapOne : listOne) { for (Map mapTwo : listTwo) { - if(mapOne.get(oneKey).toString().equals(mapTwo.get(twoKey).toString())) { - putCouponInfo(mapOne, mapTwo); - modified = true; + String oneKeyVal = (String) mapOne.get(oneKey); + String twoKeyVal = (String) mapTwo.get(twoKey); + if(StringUtils.isNotEmpty(oneKeyVal) && StringUtils.isNotEmpty(twoKeyVal)) { + if(oneKeyVal.equals(twoKeyVal)) { + putCouponInfo(mapOne, mapTwo); + modified = true; + } } } } -- 1.8.3.1