|
|
|
@ -2618,9 +2618,13 @@ public class PatrolTaskController extends BaseController { |
|
|
|
List<String> listAlgName = new ArrayList<>(); |
|
|
|
List<Map<String, String>> mapList = new ArrayList<>(); |
|
|
|
for (PatrolData item : newList) { |
|
|
|
item.setAlgName(algInfos.stream().filter( |
|
|
|
(alg) -> alg.getAlgSubtypeCode().equals(item.getAlgType())).findFirst().get().getAlgSubtypeName() |
|
|
|
); |
|
|
|
Optional<AlgInfo> first = algInfos.stream().filter( |
|
|
|
(alg) -> alg.getAlgSubtypeCode().equals(item.getAlgType())).findFirst(); |
|
|
|
if (first.isPresent()) { |
|
|
|
item.setAlgName(first.get().getAlgSubtypeName()); |
|
|
|
} else { |
|
|
|
item.setAlgName(item.getAlgType()); |
|
|
|
} |
|
|
|
if ("0".equals(item.getFilter())) { |
|
|
|
List<PatrolData> filterDatas = filterList |
|
|
|
.stream() |
|
|
|
|