fix

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/service/impl/TblDzbcCargoOrderServiceImpl.java

@@ -26,9 +26,11 @@ import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.domain.vo.TblDzbcCargoItemVo;
 import org.dromara.system.domain.vo.TblDzbcCargoOrderVo;
 import org.dromara.system.domain.vo.TblDzbcDriverTripVo;
+import org.dromara.system.domain.vo.TblDzbcSiteVo;
 import org.dromara.system.mapper.TblDzbcCargoItemMapper;
 import org.dromara.system.mapper.TblDzbcCargoOrderMapper;
 import org.dromara.system.mapper.TblDzbcDriverTripMapper;
+import org.dromara.system.mapper.TblDzbcSiteMapper;
 import org.dromara.system.mapper.TblDzbcSitePriceMapper;
 import org.dromara.system.service.ISysUserService;
 import org.dromara.system.service.ITblDzbcCargoOrderService;
@@ -57,6 +59,7 @@ public class TblDzbcCargoOrderServiceImpl implements ITblDzbcCargoOrderService {
     private final TblDzbcDriverTripMapper driverTripMapper;
     private final TblDzbcSitePriceMapper sitePriceMapper;
     private final ISysUserService userService;
+    private final TblDzbcSiteMapper siteMapper;
 
     /**
      * 查询货物订单
@@ -66,6 +69,7 @@ public class TblDzbcCargoOrderServiceImpl implements ITblDzbcCargoOrderService {
         TblDzbcCargoOrderVo vo = baseMapper.selectVoById(id);
         if (vo != null) {
             fillCargoItems(vo);
+            fillSiteNames(vo);
         }
         return vo;
     }
@@ -78,6 +82,7 @@ public class TblDzbcCargoOrderServiceImpl implements ITblDzbcCargoOrderService {
         LambdaQueryWrapper<TblDzbcCargoOrder> lqw = buildQueryWrapper(bo);
         Page<TblDzbcCargoOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         result.getRecords().forEach(this::fillCargoItems);
+        result.getRecords().forEach(this::fillSiteNames);
         return TableDataInfo.build(result);
     }
 
@@ -89,6 +94,7 @@ public class TblDzbcCargoOrderServiceImpl implements ITblDzbcCargoOrderService {
         LambdaQueryWrapper<TblDzbcCargoOrder> lqw = buildQueryWrapper(bo);
         List<TblDzbcCargoOrderVo> list = baseMapper.selectVoList(lqw);
         list.forEach(this::fillCargoItems);
+        list.forEach(this::fillSiteNames);
         return list;
     }
 
@@ -317,6 +323,27 @@ public class TblDzbcCargoOrderServiceImpl implements ITblDzbcCargoOrderService {
     }
 
     /**
+     * 填充站点名称
+     */
+    private void fillSiteNames(TblDzbcCargoOrderVo vo) {
+        if (vo == null) {
+            return;
+        }
+        if (vo.getFromSiteId() != null) {
+            TblDzbcSiteVo fromSite = siteMapper.selectVoById(vo.getFromSiteId());
+            if (fromSite != null) {
+                vo.setFromSiteName(fromSite.getName());
+            }
+        }
+        if (vo.getToSiteId() != null) {
+            TblDzbcSiteVo toSite = siteMapper.selectVoById(vo.getToSiteId());
+            if (toSite != null) {
+                vo.setToSiteName(toSite.getName());
+            }
+        }
+    }
+
+    /**
      * 更新司机任务的货物统计
      */
     private void updateTripCargoStats(Long tripId) {

ruoyi-modules/ruoyi-dzbc/src/main/java/org/dromara/system/service/impl/TblDzbcDriverTripServiceImpl.java

@@ -155,6 +155,7 @@ public class TblDzbcDriverTripServiceImpl implements ITblDzbcDriverTripService {
 
     private LambdaQueryWrapper<TblDzbcDriverTrip> buildQueryWrapper(TblDzbcDriverTripBo bo) {
         LambdaQueryWrapper<TblDzbcDriverTrip> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getId() != null, TblDzbcDriverTrip::getId, bo.getId());
         lqw.eq(bo.getPathId() != null, TblDzbcDriverTrip::getPathId, bo.getPathId());
         lqw.eq(bo.getDriverId() != null, TblDzbcDriverTrip::getDriverId, bo.getDriverId());
         lqw.like(StrUtil.isNotBlank(bo.getTripNo()), TblDzbcDriverTrip::getTripNo, bo.getTripNo());