jiangjiazhi / regional-platform

Authored by litao@lymsh.com almost 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 13 additions and 7 deletions

...	...	@@ -151,6 +151,8 @@
151	151	Map<String, Object> resultMap = new HashMap<>();
152	152	resultMap.put("errorcode", ErrorCodeConstants.SYSTEM_ERROR);
153	153	resultMap.put("errormsg", "服务器异常.");
	154	+ resultMap.put("message", e.getMessage());
	155	+ resultMap.put("exception", e.getClass());
154	156	if(!e.getClass().getSimpleName() .equals("ClientAbortException") ){
155	157	ExceptionUtils.catchException(e, "ExceptionHandlerController Exception. queryStr: " +httpServletRequest.getRequestURI() + "?"+httpServletRequest.getQueryString());
156	158	}

...	...	@@ -156,7 +156,6 @@
156	156	pulse.add(infos.containsKey(date) ? (Integer) infos.get(date).get("pulse") : 0);
157	157	}
158	158	}
159		-
160	159	return RespBuilder.buildSuccess("xyInfos", xyInfos, "szyMin", szyMin, "ssyMax", ssyMax, "ssy", ssy, "szy", szy, "pulse", pulse);
161	160	}
162	161

...	...	@@ -439,10 +439,17 @@
439	439	}
440	440
441	441	private void setCountList(List<List<String>> tabList, List<String> countList, int index) {
442		- countList.add(tabList.size() + "");
443		- countList.add("合计");
444		- countList.add("建档总数");
445	442	if(tabList.size() > 1) {
	443	+ countList.add(tabList.size() + "");
	444	+ countList.add("合计");
	445	+ if(index == 4) {
	446	+ int orgCount = 0;
	447	+ for (int i = 1; i < tabList.size(); i++) {
	448	+ orgCount += Integer.parseInt(tabList.get(i).get(4));
	449	+ }
	450	+ countList.add(orgCount + "");
	451	+ }
	452	+ countList.add("建档总数");
446	453	for (int i = index; i < tabList.get(0).size(); i++) {
447	454	int count = 0;
448	455	for (int j = 1; j < tabList.size(); j++) {
449	456
...	...	@@ -450,10 +457,8 @@
450	457	}
451	458	countList.add(count + "");
452	459	}
453		-
	460	+ tabList.add(countList);
454	461	}
455		- tabList.add(countList);
456		-
457	462	}
458	463
459	464	private void setTabListInfo(List<List<String>> tabList, int index) {