车辆积分排名

performance-api/src/main/java/com/clx/performance/vo/pc/IntegralTruckVO.java

@@ -64,8 +64,8 @@ public class IntegralTruckVO {
         return Arrays.asList(
                 new IntegralItem("运单完成积分", orderChildCompleteIntegral),
                 new IntegralItem("平台补偿积分", platformCompensationIntegral),
-                new IntegralItem("运单取消积分", orderChildCancelIntegral),
-                new IntegralItem("运单超时积分", orderChildTimeoutIntegral),
+                new IntegralItem("运单取消扣减", orderChildCancelIntegral),
+                new IntegralItem("运单超时扣减", orderChildTimeoutIntegral),
                 new IntegralItem("信息上报积分", reportIntegral)
         );
     }

performance-web/src/main/java/com/clx/performance/service/impl/IntegralTruckServiceImpl.java

@@ -177,9 +177,11 @@ public class IntegralTruckServiceImpl implements IntegralTruckService {
         if (!truckNoList.isEmpty()) {
             List<IntegralStatistics> statisticsList = integralStatisticsDao.selectListByStatisticsDateAndTruckNoList(time, truckNoList);
             Map<String, Integer> rankMap = statisticsList.stream().collect(Collectors.toMap(item -> item.getTruckNo(), item -> item.getRank()));
+            Map<String, Integer> integralMap = statisticsList.stream().collect(Collectors.toMap(item -> item.getTruckNo(), item -> item.getIntegral()));
 
             for (IntegralTruckVO item : page.getRecords()) {
                 item.setRank(rankMap.get(item.getTruckNo()));
+                item.setIntegral(integralMap.get(item.getTruckNo()));
             }
 
             Map<String, IntegralTruckVO> truckMap = page.getRecords().stream().collect(Collectors.toMap(item -> item.getTruckNo(), item -> item));