Merge branch 'refs/heads/v16.3_line_warn_20240528' into test

performance-api/src/main/java/com/clx/performance/enums/vehiclewarn/VehicleWarnUserEnum.java

@@ -24,7 +24,7 @@ public enum VehicleWarnUserEnum {
     @Getter
     @AllArgsConstructor
     public enum NoticeStatus {
-        NO(0, "禁用"),
+        NO(0, "关闭"),
         YES(1, "开启"),
 
         ;

performance-web/src/main/java/com/clx/performance/dao/impl/linewarn/LineWarnInfoDaoImpl.java

@@ -38,7 +38,7 @@ public class LineWarnInfoDaoImpl extends BaseDaoImpl<LineWarnInfoMapper, LineWar
     public boolean updateSuspendTime(LineWarnInfo item) {
 
         return update(lUdWrapper()
-                .eq(LineWarnInfo::getWarnConfigId, item.getWarnConfigId())
+                .eq(LineWarnInfo::getId, item.getId())
                 .ne(LineWarnInfo::getStatus, LineWarnInfoEnum.Status.RESOLVE.getCode())
                 .set(LineWarnInfo::getSuspendTime, item.getSuspendTime())
         );

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

@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.linewarn;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.linewarn.LineWarnInfoDao;
 import com.clx.performance.dao.linewarn.LineWarnLogDao;
 import com.clx.performance.dao.linewarn.LineWarnRangeDao;
@@ -11,6 +12,7 @@ import com.clx.performance.enums.ResultEnum;
 import com.clx.performance.enums.linewarn.LineWarnInfoEnum;
 import com.clx.performance.enums.linewarn.LineWarnLogEnum;
 import com.clx.performance.enums.linewarn.LineWarnRangEnum;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.linewarn.LineWarnInfo;
 import com.clx.performance.model.linewarn.LineWarnLog;
 import com.clx.performance.model.linewarn.LineWarnRange;
@@ -49,6 +51,8 @@ public class LineWarnInfoServiceImpl implements LineWarnInfoService {
 
     @Autowired
     private OrderChildDao orderChildDao;
+    @Autowired
+    private OrderGoodsDao orderGoodsDao;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -120,12 +124,15 @@ public class LineWarnInfoServiceImpl implements LineWarnInfoService {
         // 更新车数统计数据
         List<String> orderGoodsNoList = page.getRecords().stream().map(item -> item.getOrderGoodsNo()).collect(Collectors.toList());
         if (!orderGoodsNoList.isEmpty()) {
+            List<OrderGoods> pengList = orderGoodsDao.selectListByOrderGoodsList(orderGoodsNoList);
+
             List<LineWarnOrderChildStatisticsDTO> takeList = orderChildDao.sumTakeNumByOrderGoodsNoList(orderGoodsNoList);
             List<LineWarnOrderChildStatisticsDTO> sendList = orderChildDao.sumArriveSendNumByOrderGoodsNoList(orderGoodsNoList);
             List<LineWarnOrderChildStatisticsDTO> loadList = orderChildDao.sumLoadNumByOrderGoodsNoList(orderGoodsNoList);
             List<LineWarnOrderChildStatisticsDTO> receiveList = orderChildDao.sumArriveRecieveNumByOrderGoodsNoList(orderGoodsNoList);
             List<LineWarnOrderChildStatisticsDTO> unloadList = orderChildDao.sumUnloadNumByOrderGoodsNoList(orderGoodsNoList);
 
+            Map<String, OrderGoods> pengMap = pengList.stream().collect(Collectors.toMap(item -> item.getOrderGoodsNo(), item -> item));
             Map<String, LineWarnOrderChildStatisticsDTO> takeMap = takeList.stream().collect(Collectors.toMap(item -> item.getOrderGoodsNo(), item -> item));
             Map<String, LineWarnOrderChildStatisticsDTO> sendMap = sendList.stream().collect(Collectors.toMap(item -> item.getOrderGoodsNo(), item -> item));
             Map<String, LineWarnOrderChildStatisticsDTO> loadMap = loadList.stream().collect(Collectors.toMap(item -> item.getOrderGoodsNo(), item -> item));
@@ -133,6 +140,7 @@ public class LineWarnInfoServiceImpl implements LineWarnInfoService {
             Map<String, LineWarnOrderChildStatisticsDTO> unloadMap = unloadList.stream().collect(Collectors.toMap(item -> item.getOrderGoodsNo(), item -> item));
 
             for (LineWarnInfoVO item : page.getRecords()) {
+                item.setPengNum(pengMap.get(item.getOrderGoodsNo()) == null? 0:pengMap.get(item.getOrderGoodsNo()).getNeedTruckNum());
                 item.setTakeNum(takeMap.get(item.getOrderGoodsNo()) == null? 0:takeMap.get(item.getOrderGoodsNo()).getNum());
                 item.setArriveSendNum(sendMap.get(item.getOrderGoodsNo()) == null? 0:sendMap.get(item.getOrderGoodsNo()).getNum());
                 item.setLoadNum(loadMap.get(item.getOrderGoodsNo()) == null? 0:loadMap.get(item.getOrderGoodsNo()).getNum());