...
|
...
|
@@ -40,7 +40,6 @@ import org.springframework.stereotype.Service; |
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
public class YzService extends BaseSceneService {
|
...
|
...
|
@@ -98,7 +97,11 @@ public class YzService extends BaseSceneService { |
|
|
}
|
|
|
//按照固定的顺序重排序
|
|
|
List<Map<String, String>> maxSortListSorted = new ArrayList<>();
|
|
|
Map<String, Map<String, String>> sortInfoMap = maxList.stream().collect(Collectors.toMap(p -> p.get("sort_id"), p -> p));
|
|
|
Map<String, Map<String, String>> sortInfoMap = new HashMap<>();
|
|
|
for (Map<String, String> map : maxList) {
|
|
|
String sortId = map.get("sort_id");
|
|
|
sortInfoMap.put(sortId, map);
|
|
|
}
|
|
|
for (String sortId : maxSortIdOrderList) {
|
|
|
if (sortInfoMap.containsKey(sortId)) {
|
|
|
maxSortListSorted.add(sortInfoMap.get(sortId));
|
...
|
...
|
|