ljx：新增同比增速匹配接口和同比增速接口的企业名称排序

enteprise-admin/src/main/java/com/enteprise/growthRate/service/impl/GrowthRateServiceImpl.java

@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static com.enteprise.util.CommonUtil.getRange;
+import static com.enteprise.util.CommonUtil.sortByNumberInName;
 
 
 @Service
@@ -42,7 +43,7 @@ public class GrowthRateServiceImpl implements IGrowthRateService {
         Enterprise enterprise = new Enterprise();
         enterprise.setCode(growthRate.getCode());
         enterprise.setTypeNum(growthRate.getTypeNum());
-        List<EnterpriseDto> enterpriseDtos = enterpriseMapper.selectAllWithType(enterprise);
+        List<EnterpriseDto> enterpriseDtos = sortByNumberInName(enterpriseMapper.selectAllWithType(enterprise));
         if (analysisType.isEmpty() || year == 0) {
             return null;
         } else {

enteprise-admin/src/main/java/com/enteprise/matchAnalysis/service/impl/MatchServiceImpl.java

@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static com.enteprise.util.CommonUtil.getRange;
+import static com.enteprise.util.CommonUtil.sortByNumberInName;
 
 @Service
 public class MatchServiceImpl implements IMatchService {
@@ -48,7 +49,7 @@ public class MatchServiceImpl implements IMatchService {
         Enterprise enterprise = new Enterprise();
         enterprise.setCode(matchAna.getCode());
         enterprise.setTypeNum(matchAna.getTypeNum());
-        List<EnterpriseDto> enterpriseDtos = enterpriseMapper.selectAllWithType(enterprise);
+        List<EnterpriseDto> enterpriseDtos = sortByNumberInName(enterpriseMapper.selectAllWithType(enterprise));
         //对应评估类型业务逻辑
         if (dataKey.equals("powerConsume")){
             //用电逻辑,月度指标

enteprise-admin/src/main/java/com/enteprise/util/CommonUtil.java

@@ -1,6 +1,10 @@
 package com.enteprise.util;
 
+import com.enteprise.enterprise.dto.EnterpriseDto;
+
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public class CommonUtil {
@@ -25,4 +29,24 @@ public class CommonUtil {
 
         return list;
     }
+
+    public static List<EnterpriseDto> sortByNumberInName(List<EnterpriseDto> list) {
+        List<EnterpriseDto> newList = new ArrayList<>(list);
+        newList.sort(new Comparator<EnterpriseDto>() {
+            @Override
+            public int compare(EnterpriseDto a1, EnterpriseDto a2) {
+                int num1 = extractNumber(a1.getEnterpriseName());
+                int num2 = extractNumber(a2.getEnterpriseName());
+                return Integer.compare(num1, num2);
+            }
+        });
+        return newList;
+    }
+
+    // 从名称中提取数字的方法
+    private static int extractNumber(String name) {
+        // 使用正则表达式提取出字符串中的数字部分
+        String numberPart = name.replaceAll("\\D+", ""); // 去掉非数字字符
+        return Integer.parseInt(numberPart.isEmpty() ? "0" : numberPart); // 转换为整数，默认返回 0
+    }
 }