1、数据割接程序，白云区矛盾纠纷多元化解平台 2、纠纷态势报错修改

liyj

2024-10-21 21f45258cfcdc79127f85ad6e45736cff5acd345

 dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java

@@ -315,17 +315,17 @@
                areaBO.setSort(map.get(areaBO.getLabel()));
            }
        }
        list.sort((o1, o2) -> {
            Integer totalScore1 = Integer.valueOf(o1.getSort());
            Integer totalScore2 = Integer.valueOf(o2.getSort());
            if (totalScore1 > totalScore2) {
                return 1;
            } else if (totalScore1.equals(totalScore2)) {
                return 0;
            } else {
                return -1;
            }
        });
//        list.sort((o1, o2) -> {
//            Integer totalScore1 = Integer.valueOf(o1.getSort());
//            Integer totalScore2 = Integer.valueOf(o2.getSort());
//            if (totalScore1 > totalScore2) {
//                return 1;
//            } else if (totalScore1.equals(totalScore2)) {
//                return 0;
//            } else {
//                return -1;
//            }
//        });
        return list;
    }

@@ -336,17 +336,17 @@
            for (AreaBO selectTermDTO : termsSet) {
                termsList.add(selectTermDTO);
            }
            termsList.sort((o1, o2)->{
                Double totalScore1 = Double.valueOf(o1.getValue());
                Double totalScore2 = Double.valueOf(o2.getValue());
                if(totalScore1 > totalScore2) {
                    return 1;
                }else if (totalScore1.equals(totalScore2)) {
                    return 0;
                }else {
                    return -1;
                }
            });
//            termsList.sort((o1, o2)->{
//                Double totalScore1 = Double.valueOf(o1.getValue());
//                Double totalScore2 = Double.valueOf(o2.getValue());
//                if(totalScore1 > totalScore2) {
//                    return 1;
//                }else if (totalScore1.equals(totalScore2)) {
//                    return 0;
//                }else {
//                    return -1;
//                }
//            });
        }
        return termsList;
    }