From 162495d7f8080be2d3786fe8301440eb7b3692a7 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Thu, 9 Feb 2017 17:34:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyStatisticsManagerFacade.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index f25e157..627dece 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -393,7 +393,12 @@ public class BabyStatisticsManagerFacade { } catch (Exception e) { index++; } - if (CollectionUtils.isEmpty(babyStatisticsManagerWeekAgeGroupQueryModelList) || babyStatisticsManagerWeekAgeGroupQueryModelList.size() < index || babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null || !i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge())) { + if (CollectionUtils.isEmpty(babyStatisticsManagerWeekAgeGroupQueryModelList) || babyStatisticsManagerWeekAgeGroupQueryModelList.size() < index) { + BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); + babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0"); + babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString()); + babyStatisticsManagerWeekAgeGroupQueryModelListResult.add(babyStatisticsManagerWeekAgeGroupQueryModel); + } else if (babyStatisticsManagerWeekAgeGroupQueryModelList.size() > index && (babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null || !i.toString().equals(babyStatisticsManagerWeekAgeGroupQueryModelList.get(index).getWeekAge()))) { BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0"); babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString()); @@ -776,7 +781,9 @@ public class BabyStatisticsManagerFacade { } catch (Exception e) { index++; } - if (CollectionUtils.isEmpty(list) || list.size() < index || list.get(index) == null || !i.toString().equals(list.get(index).get("EXAMINE_MONTH") == null ? "" : list.get(index).get("EXAMINE_MONTH").toString())) { + if (CollectionUtils.isEmpty(list) || list.size() < index) { + result.add(0); + } else if (list.size() < index && (list.get(index) == null || !i.toString().equals(list.get(index).get("EXAMINE_MONTH").toString()))) { result.add(0); } else { try { -- 1.8.3.1