Commit 60d433f2c014afd247b7988746c3bc290027c277
1 parent
96845609df
Exists in
master
and in
6 other branches
其他高危
Showing 1 changed file with 19 additions and 20 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
60d433f
| ... | ... | @@ -397,7 +397,7 @@ |
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | //处理高危 |
| 400 | - handleRisk(record,cjStatisticsListResult); | |
| 400 | + handleRisk(record, cjStatisticsListResult); | |
| 401 | 401 | |
| 402 | 402 | data.add(cjStatisticsListResult); |
| 403 | 403 | } |
| ... | ... | @@ -436,8 +436,7 @@ |
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | |
| 439 | - | |
| 440 | - private void handleRisk(AntExRecordModel e , CjStatisticsListResult antExManagerResult){ | |
| 439 | + private void handleRisk(AntExRecordModel e, CjStatisticsListResult antExManagerResult) { | |
| 441 | 440 | if (StringUtils.isNotEmpty(e.getfId())) { |
| 442 | 441 | String risk = null; |
| 443 | 442 | if (e.getType() == 2) { |
| 444 | 443 | |
| 445 | 444 | |
| 446 | 445 | |
| 447 | 446 | |
| ... | ... | @@ -451,28 +450,28 @@ |
| 451 | 450 | risk = model.getOtherRisk(); |
| 452 | 451 | } |
| 453 | 452 | } |
| 454 | - Map result = commonService.resolveOtherRisk(risk); | |
| 455 | - if(!result.isEmpty()){ | |
| 453 | + String name = null, score = null; | |
| 454 | + Map result = commonService.resolveOtherRisk(risk); | |
| 455 | + if (!result.isEmpty()) { | |
| 456 | 456 | //高危因素名字 |
| 457 | - String name =result.get("name").toString(); | |
| 458 | - String level =result.get("levelId").toString(); | |
| 459 | - String score =result.get("score").toString(); | |
| 457 | + name = result.get("name").toString(); | |
| 458 | + String level = result.get("levelId").toString(); | |
| 459 | + score = result.get("score").toString(); | |
| 460 | 460 | |
| 461 | - if(org.apache.commons.lang.StringUtils.isNotEmpty(level) &&!"null".equals(level)){ | |
| 461 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(level) && !"null".equals(level)) { | |
| 462 | 462 | e.gethLevel().add(level); |
| 463 | 463 | } |
| 464 | - | |
| 465 | - //高危因素 | |
| 466 | - antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); | |
| 467 | - String ri= commonService.resloveFactor(e.gethRisk()); | |
| 468 | - if(ri.isEmpty()){ | |
| 469 | - ri=name; | |
| 470 | - }else if(StringUtils.isNotEmpty(name)){ | |
| 471 | - ri+=","+name; | |
| 472 | - } | |
| 473 | - antExManagerResult.setrRisk(ri); | |
| 474 | - antExManagerResult.setScore((e.gethScore()+NumberUtils.toInt(score,0))); | |
| 475 | 464 | } |
| 465 | + //高危因素 | |
| 466 | + antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); | |
| 467 | + String ri = commonService.resloveFactor(e.gethRisk()); | |
| 468 | + if (ri.isEmpty()) { | |
| 469 | + ri = name; | |
| 470 | + } else if (StringUtils.isNotEmpty(name)) { | |
| 471 | + ri += "," + name; | |
| 472 | + } | |
| 473 | + antExManagerResult.setrRisk(ri); | |
| 474 | + antExManagerResult.setScore((e.gethScore() + NumberUtils.toInt(score, 0))); | |
| 476 | 475 | } |
| 477 | 476 | } |
| 478 | 477 |