jiangjiazhi / regional-platform

Authored by jiangjiazhi over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files

...	...	@@ -786,6 +786,8 @@
786	786	otherRisk.append(fxysu+",");
787	787	}
788	788	score+=NumberUtils.toInt(map.get("score").toString(),0);
	789	+
	790	+ highScoreResult.getLevelId().add(map.get("fyyse").toString());
789	791	}
790	792	if(StringUtils.isNotEmpty(otherRisk.toString())){
791	793	highScoreResult.setOtherRisk(otherRisk.substring(0, otherRisk.length() - 1));
792	794
...	...	@@ -831,9 +833,11 @@
831	833	for (Map<String, Object> map : listMap) {
832	834	Object fxysu = map.get("fxysu").toString();
833	835	if (fxysu != null) {
834		- otherRisk.append(fxysu);
	836	+ otherRisk.append(fxysu+",");
835	837	}
836	838	score+=NumberUtils.toInt(map.get("score").toString(),0);
	839	+
	840	+ highScoreResult.getLevelId().add(map.get("fyyse").toString());
837	841	}
838	842	highScoreResult.setScore(highScoreResult.getScore()+score);
839	843	if(StringUtils.isNotEmpty(otherRisk.toString())){

...	...	@@ -190,10 +190,12 @@
190	190	antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel()));
191	191	String ri = commonService.resloveFactor(e.gethRisk());
192	192	if (StringUtils.isNotEmpty(name.toString())) {
193		- ri = name.substring(0, name.length() - 1);
194		- } else if (StringUtils.isNotEmpty(name.toString())) {
195		- ri += "," + name.substring(0, name.length() - 1);
	193	+ if (StringUtils.isNotEmpty(ri)) {
	194	+ ri += ",";
	195	+ }
	196	+ ri += name.substring(0, name.length() - 1);
196	197	}
	198	+
197	199	antExManagerResult.setRiskFactor(ri);
198	200	antExManagerResult.setRiskScore((e.gethScore() + score) + "");
199	201	}