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("合计");