From 60d433f2c014afd247b7988746c3bc290027c277 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 22 Jun 2017 10:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E9=AB=98=E5=8D=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntExRecordFacade.java | 39 +++++++++++----------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 8293c83..64d8abf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -397,7 +397,7 @@ public class AntExRecordFacade { } //处理高危 - handleRisk(record,cjStatisticsListResult); + handleRisk(record, cjStatisticsListResult); data.add(cjStatisticsListResult); } @@ -436,8 +436,7 @@ public class AntExRecordFacade { } - - private void handleRisk(AntExRecordModel e , CjStatisticsListResult antExManagerResult){ + private void handleRisk(AntExRecordModel e, CjStatisticsListResult antExManagerResult) { if (StringUtils.isNotEmpty(e.getfId())) { String risk = null; if (e.getType() == 2) { @@ -451,28 +450,28 @@ public class AntExRecordFacade { risk = model.getOtherRisk(); } } - Map result = commonService.resolveOtherRisk(risk); - if(!result.isEmpty()){ + String name = null, score = null; + Map result = commonService.resolveOtherRisk(risk); + if (!result.isEmpty()) { //高危因素名字 - String name =result.get("name").toString(); - String level =result.get("levelId").toString(); - String score =result.get("score").toString(); + name = result.get("name").toString(); + String level = result.get("levelId").toString(); + score = result.get("score").toString(); - if(org.apache.commons.lang.StringUtils.isNotEmpty(level) &&!"null".equals(level)){ + if (org.apache.commons.lang.StringUtils.isNotEmpty(level) && !"null".equals(level)) { e.gethLevel().add(level); } - - //高危因素 - antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); - String ri= commonService.resloveFactor(e.gethRisk()); - if(ri.isEmpty()){ - ri=name; - }else if(StringUtils.isNotEmpty(name)){ - ri+=","+name; - } - antExManagerResult.setrRisk(ri); - antExManagerResult.setScore((e.gethScore()+NumberUtils.toInt(score,0))); } + //高危因素 + antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); + String ri = commonService.resloveFactor(e.gethRisk()); + if (ri.isEmpty()) { + ri = name; + } else if (StringUtils.isNotEmpty(name)) { + ri += "," + name; + } + antExManagerResult.setrRisk(ri); + antExManagerResult.setScore((e.gethScore() + NumberUtils.toInt(score, 0))); } } -- 1.8.3.1