|
@@ -18,10 +18,7 @@ import com.project.common.utils.StringUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -189,6 +186,7 @@ public class PlatBasicsCompanyServiceImpl extends ServiceImpl<PlatBasicsCompanyM
|
|
|
" END AS active_rate");
|
|
|
basicsQueryWrapper.last("limit 10");
|
|
|
basicsQueryWrapper.orderByDesc("active_rate");
|
|
|
+ basicsQueryWrapper.orderByAsc("app_org");
|
|
|
List<PlatBasics> list = iPlatBasicsService.list(basicsQueryWrapper);
|
|
|
Map<String, Object> tempMap = new HashMap<>();
|
|
|
List<String> companyNameList;
|