From 2ca57827f9a21f42f293c15e735193d7f356e1bb Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Thu, 30 Nov 2017 11:27:35 +0800 Subject: [PATCH] gai bu g --- .../src/main/java/com/lyms/platform/common/utils/DateUtil.java | 2 +- .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 228fce0..45c261f 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1335,7 +1335,7 @@ public class DateUtil { temp.put("cname", dates.get(i)); if(i == 0) { temp.put("start", start); - temp.put("end", dates.get(i + 1)); + temp.put("end", dates.size() > 1 ? dates.get(i + 1) : dates.get(i + 0)); } else if(i == dates.size() - 1) { temp.put("start", dates.get(dates.size() - 1)); temp.put("end", end); 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 48950f2..4e3f3f0 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 @@ -439,7 +439,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } private void setCountList(List> tabList, List countList, int index) { - if(tabList.size() > 1) { countList.add(tabList.size() + ""); countList.add("合计"); -- 1.8.3.1