优化方案查询

wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java

@@ -144,5 +144,4 @@ public class Volunteer  implements Serializable {
     private Date queryTime;
 
 
-
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java

@@ -711,23 +711,49 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
      */
     private List<Volunteer> getVolunteerList(List<Volunteer> list, Integer total) {
         List<Volunteer> result = new ArrayList<>();
-        result.add(list.get(0));
         List<Volunteer> otherList = new ArrayList<>();
-        List<String> grades = new ArrayList<>();
-        grades.add(list.get(0).getLowestMark());
-        for (Volunteer volunteer : list) {
-            if (!grades.contains(volunteer.getLowestMark()) && result.size() <= total) {
-                grades.add(volunteer.getLowestMark());
-                result.add(volunteer);
+        Map<String, List<Volunteer>> map = list.stream().collect(Collectors.groupingBy(Volunteer::getLowestMark
+        ));
+
+        for (Map.Entry<String, List<Volunteer>> entry : map.entrySet()) {
+            List<Volunteer> volunteerList = entry.getValue();
+            if (volunteerList.size() > 2) {
+                result.addAll(volunteerList.subList(0, 2));
+                otherList.addAll(volunteerList.subList(2, volunteerList.size()));
             } else {
-                otherList.add(volunteer);
+                result.addAll(volunteerList);
+            }
+
+            if (result.size() >= total) {
+                return result.subList(0, total);
             }
         }
 
         if (result.size() < total) {
-            int number = total - result.size();
-            List<Volunteer> volunteers = otherList.subList(0, number);
-            result.addAll(volunteers);
+            List<Volunteer> otherListB = new ArrayList<>();
+
+            Map<String, List<Volunteer>> mapB = otherList.stream().collect(Collectors.groupingBy(Volunteer::getLowestMark
+            ));
+
+            for (Map.Entry<String, List<Volunteer>> entry : map.entrySet()) {
+                List<Volunteer> volunteerList = entry.getValue();
+                if (volunteerList.size() > 2) {
+                    result.addAll(volunteerList.subList(0, 2));
+                    otherListB.addAll(volunteerList.subList(2, volunteerList.size()));
+                } else {
+                    result.addAll(volunteerList);
+                }
+
+                if (result.size() >= total) {
+                    return result.subList(0, total);
+                }
+            }
+
+            if (result.size() < total) {
+                int number = total - result.size();
+                List<Volunteer> volunteers = otherListB.subList(0, number);
+                result.addAll(volunteers);
+            }
         }
         return result;
     }