Commit ca421df38ec08d4b8936571ebace5728cc384f70
1 parent
00729b6f8f
Exists in
master
and in
6 other branches
高危检查列表
Showing 1 changed file with 7 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
ca421df
| ... | ... | @@ -626,7 +626,7 @@ |
| 626 | 626 | |
| 627 | 627 | private List<AntExRecordModel> getIncrRiskAntexRecard(Map<String,List<AntExRecordModel>> map,AntExRecordQuery pageAntExRecordsQuery,AntExManagerQueryRequest request) |
| 628 | 628 | { |
| 629 | - List<String> riskListIds = new ArrayList<>(); | |
| 629 | + List<String> ids = new ArrayList<>(); | |
| 630 | 630 | Map<String,List<String>> incriskMap = new HashMap<>(); |
| 631 | 631 | AntExRecordQuery beforeRecordQuery = new AntExRecordQuery(); |
| 632 | 632 | |
| ... | ... | @@ -656,7 +656,7 @@ |
| 656 | 656 | |
| 657 | 657 | if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) |
| 658 | 658 | { |
| 659 | - riskListIds.add(oneRecord.getId()); | |
| 659 | + ids.add(oneRecord.getId()); | |
| 660 | 660 | incriskMap.put(oneRecord.getId(), currentRiskList); |
| 661 | 661 | } |
| 662 | 662 | else if (CollectionUtils.isNotEmpty(beforeRiskList) ) |
| 663 | 663 | |
| ... | ... | @@ -671,14 +671,14 @@ |
| 671 | 671 | } |
| 672 | 672 | if (CollectionUtils.isNotEmpty(incrHrisk)) |
| 673 | 673 | { |
| 674 | - riskListIds.add(oneRecord.getId()); | |
| 674 | + ids.add(oneRecord.getId()); | |
| 675 | 675 | incriskMap.put(oneRecord.getId(), incrHrisk); |
| 676 | 676 | } |
| 677 | 677 | } |
| 678 | 678 | } |
| 679 | 679 | else |
| 680 | 680 | { |
| 681 | - riskListIds.add(oneRecord.getId()); | |
| 681 | + ids.add(oneRecord.getId()); | |
| 682 | 682 | incriskMap.put(oneRecord.getId(), oneRecord.gethRisk()); |
| 683 | 683 | } |
| 684 | 684 | } |
| ... | ... | @@ -699,7 +699,7 @@ |
| 699 | 699 | List beforeRiskList = twoRecord.gethRisk(); |
| 700 | 700 | if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) |
| 701 | 701 | { |
| 702 | - riskListIds.add(oneRecord.getId()); | |
| 702 | + ids.add(oneRecord.getId()); | |
| 703 | 703 | incriskMap.put(oneRecord.getId(), currentRiskList); |
| 704 | 704 | } |
| 705 | 705 | else if (CollectionUtils.isNotEmpty(beforeRiskList) ) |
| ... | ... | @@ -714,7 +714,7 @@ |
| 714 | 714 | } |
| 715 | 715 | if (CollectionUtils.isNotEmpty(incrHrisk)) |
| 716 | 716 | { |
| 717 | - riskListIds.add(oneRecord.getId()); | |
| 717 | + ids.add(oneRecord.getId()); | |
| 718 | 718 | incriskMap.put(oneRecord.getId(), incrHrisk); |
| 719 | 719 | } |
| 720 | 720 | } |
| ... | ... | @@ -725,7 +725,7 @@ |
| 725 | 725 | pageAntExRecordsQuery.setNeed("true"); |
| 726 | 726 | pageAntExRecordsQuery.setPage(request.getPage()); |
| 727 | 727 | pageAntExRecordsQuery.setLimit(request.getLimit()); |
| 728 | - pageAntExRecordsQuery.setIds(riskListIds); | |
| 728 | + pageAntExRecordsQuery.setIds(ids); | |
| 729 | 729 | pageAntExRecordsQuery.setLevelId(request.getLevel()); |
| 730 | 730 | |
| 731 | 731 | pageAntExRecordsQuery.setrFactor(request.getRiskFactorId()); |