提交全图监控

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtLogisticsOrderController.java

@@ -200,9 +200,9 @@ public class KwtLogisticsOrderController {
     /**
      * 查询物流订单托运/承运企业（unitType：1托运、2承运）
      */
-    @PostMapping("/orderUnits")
+    @GetMapping("/orderUnits")
     @Operation(summary = "查询物流订单托运/承运企业")
-    public BaseResult<List<LogisticsOrderUnitResp>> orderUnits(@RequestBody @Valid LogisticsOrderUnitReq req) {
-        return BaseResult.success(transportCommonService.queryOrderUnits(req.getLogisticOrderId()));
+    public BaseResult<List<LogisticsOrderUnitResp>> orderUnits() {
+        return BaseResult.success(transportCommonService.queryOrderUnits();
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/LogisticsOrderUnitResp.java

@@ -3,10 +3,16 @@ package com.sckw.transport.model.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 
+/**
+ * @author PC
+ */
 @Data
 public class LogisticsOrderUnitResp implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 3135159552358047843L;
     @Schema(description = "主键")
     private Long id;
     @Schema(description = "物流订单ID")

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtLogisticsOrderRepository.java

@@ -124,4 +124,11 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
                 .eq(KwtLogisticsOrder::getLOrderNo, lOrderNo)
                 .last("limit 1"));
     }
+
+    public List<KwtLogisticsOrder> queryByEntId(Long entId) {
+        return list(Wrappers.<KwtLogisticsOrder>lambdaQuery()
+                .eq(KwtLogisticsOrder::getDelFlag,0)
+                .eq(KwtLogisticsOrder::getEntId, entId)
+                .orderByDesc(KwtLogisticsOrder::getId));
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtTransportCommonService.java

@@ -47,6 +47,7 @@ import com.sckw.transport.model.param.ContractParam;
 import com.sckw.transport.model.param.LogisticsOrderParam;
 import com.sckw.transport.model.vo.LogisticsOrderUnitResp;
 import com.sckw.transport.model.vo.*;
+import com.sckw.transport.repository.KwtLogisticsOrderRepository;
 import com.sckw.transport.repository.KwtLogisticsOrderUnitRepository;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.annotation.Resource;
@@ -142,7 +143,8 @@ public class KwtTransportCommonService {
     @Autowired
     private KwtLogisticsOrderLineFreightRateMapper kwtLogisticsOrderLineFreightRateMapper;
 
-    public final KwtLogisticsOrderUnitRepository logisticsOrderUnitRepository;
+    private final KwtLogisticsOrderUnitRepository logisticsOrderUnitRepository;
+    private final KwtLogisticsOrderRepository logisticsOrderRepository;
     /**
      * 查看订单详情
      *
@@ -1889,12 +1891,18 @@ public class KwtTransportCommonService {
     /**
      * 查询物流订单托运/承运企业
      */
-    public List<LogisticsOrderUnitResp> queryOrderUnits(Long lOrderId) {
-        log.info("查询物流订单托运/承运企业---> lOrderId:{}", lOrderId);
-        if (lOrderId == null) {
-            throw new BusinessException("物流订单ID不能为空");
+    public List<LogisticsOrderUnitResp> queryOrderUnits() {
+        log.info("查询物流订单托运/承运企业");
+        Long entId = LoginUserHolder.getEntId();
+        //根据企业查询物流订单
+        List<KwtLogisticsOrder> logisticsOrders = logisticsOrderRepository.queryByEntId(entId);
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(logisticsOrders)){
+            return List.of();
         }
-        List<KwtLogisticsOrderUnit> units =logisticsOrderUnitRepository.queryListByLOrderId(lOrderId);
+        List<Long> logIds = logisticsOrders.stream()
+                .map(KwtLogisticsOrder::getId)
+                .collect(Collectors.toList());
+        List<KwtLogisticsOrderUnit> units =logisticsOrderUnitRepository.queryByLOrderIds(logIds);
         if (CollectionUtils.isEmpty(units)){
             return List.of();
         }