feat: 地址排序出错

guzijian
1 parent 75386fb4
Showing 1 changed file with 17 additions and 13 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
@@ -32,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 /**
  * @author 20412
@@ -581,7 +582,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         Integer pageNum = ServletUtils.getParameterToInt("pageNum");
         Integer pageSize = ServletUtils.getParameterToInt("pageSize");
         Integer orderByColumn = ServletUtils.getParameterToInt("orderByColumn");
-
         Comparator<TransportationEnterpriseVo> comparator;
         if (1 == orderByColumn) {
             comparator = Comparator.comparing(TransportationEnterpriseVo::getCleanNumber);
@@ -609,19 +609,23 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         qw.eq(GarAddress::getGarUserId, SecurityUtils.getLoginUser().getUser().getUserId())
                 .eq(GarAddress::getGarUserDefault, GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue());
         GarAddress address = garAddressService.getOne(qw);
-        List<TransportationEnterpriseVo> voList = list.stream().map(item -> {
-                    TransportationEnterpriseVo vo = new TransportationEnterpriseVo();
-                    BeanUtils.copyProperties(item, vo);
-                    List<GarOrderEvaluate> evaluate = evaluateMap.get(String.valueOf(item.getId()));
-                    handleCleanNumber(vo, orderList);
-                    handleScore(vo, evaluate);
-                    handleDistance(vo, address);
-                    return vo;
-                })
-                // 降序
-                .sorted(comparator.reversed())
-                .collect(Collectors.toList());
+        Stream<TransportationEnterpriseVo> stream = list.stream().map(item -> {
+            TransportationEnterpriseVo vo = new TransportationEnterpriseVo();
+            BeanUtils.copyProperties(item, vo);
+            List<GarOrderEvaluate> evaluate = evaluateMap.get(String.valueOf(item.getId()));
+            handleCleanNumber(vo, orderList);
+            handleScore(vo, evaluate);
+            handleDistance(vo, address);
+            return vo;
+        });
+        List<TransportationEnterpriseVo> voList;
+        if ( orderByColumn != 0){
+            // 降序
+            voList= stream.sorted(comparator.reversed()).collect(Collectors.toList());
+        }else {
+            voList= stream.sorted(comparator).collect(Collectors.toList());
+        }
         int total = voList.size();
         int remainder = total % pageSize;
         int currentPage = pageNum > 0 ? (pageNum - 1) * pageSize : pageNum * pageSize;