|
@@ -152,6 +152,7 @@ public class CompanyUtils {
|
|
public static List<Map<String, String>> trans(Collection<List<MergePerson>> collect) {
|
|
public static List<Map<String, String>> trans(Collection<List<MergePerson>> collect) {
|
|
List<Map<String, String>> list = new ArrayList<>();
|
|
List<Map<String, String>> list = new ArrayList<>();
|
|
collect.forEach(v -> v.stream()
|
|
collect.forEach(v -> v.stream()
|
|
|
|
+ .filter(CompanyUtils::is_pass)
|
|
.max(Comparator.comparing(MergePerson::getCnt))
|
|
.max(Comparator.comparing(MergePerson::getCnt))
|
|
.ifPresent(maxPerson -> v.forEach(m -> {
|
|
.ifPresent(maxPerson -> v.forEach(m -> {
|
|
if (!m.getOld_human_pid().equals(maxPerson.getOld_human_pid())) {
|
|
if (!m.getOld_human_pid().equals(maxPerson.getOld_human_pid())) {
|
|
@@ -172,6 +173,14 @@ public class CompanyUtils {
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public static Boolean is_pass(MergePerson m) {
|
|
|
|
+ //大众人名且超过100家,过滤
|
|
|
|
+ if (m.getCnt() > 100 && CommonName.NAMES.contains(m.getNew_human_name())) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ return m.getCnt() <= 500;
|
|
|
|
+ }
|
|
|
|
+
|
|
public static Collection<List<MergePerson>> getMergePerson(Session session, String cql, HashMap<String, Object> parameters) {
|
|
public static Collection<List<MergePerson>> getMergePerson(Session session, String cql, HashMap<String, Object> parameters) {
|
|
List<Record> dataList = getRecords(session, cql, parameters);
|
|
List<Record> dataList = getRecords(session, cql, parameters);
|
|
return dataList.stream()
|
|
return dataList.stream()
|