jiangjiazhi / regional-platform | GitLab

Commit 2ca57827f9a21f42f293c15e735193d7f356e1bb

Authored by litao@lymsh.com over 7 years ago

1 parent 255f578c5e

Exists in master and in 6 other branches

gai bu g

Showing 2 changed files with 1 additions and 2 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java

...	...	@@ -1335,7 +1335,7 @@
1335	1335	temp.put("cname", dates.get(i));
1336	1336	if(i == 0) {
1337	1337	temp.put("start", start);
1338		- temp.put("end", dates.get(i + 1));
	1338	+ temp.put("end", dates.size() > 1 ? dates.get(i + 1) : dates.get(i + 0));
1339	1339	} else if(i == dates.size() - 1) {
1340	1340	temp.put("start", dates.get(dates.size() - 1));
1341	1341	temp.put("end", end);

...	...	@@ -439,7 +439,6 @@
439	439	}
440	440
441	441	private void setCountList(List<List<String>> tabList, List<String> countList, int index) {
442		-
443	442	if(tabList.size() > 1) {
444	443	countList.add(tabList.size() + "");
445	444	countList.add("合计");