提交合同查询接口

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1738,9 +1738,9 @@ public class KwcContractTradeService {
                 new KwcContractLogisticsUnit());
         KwcContractLogisticsUnit acceptCarriageEnt = contractLogisticsMap.getOrDefault(log.getId() + "_" + CooperateTypeEnum.CARRIAGE.getCode(),
                 new KwcContractLogisticsUnit());
-        contractLogisticsOrderResDto.setConsignEntId(consignEnt.getContractId());
+        contractLogisticsOrderResDto.setConsignEntId(consignEnt.getEntId());
         contractLogisticsOrderResDto.setConsignEntName(consignEnt.getFirmName());
-        contractLogisticsOrderResDto.setAcceptCarriageEntId(acceptCarriageEnt.getContractId());
+        contractLogisticsOrderResDto.setAcceptCarriageEntId(acceptCarriageEnt.getEntId());
         contractLogisticsOrderResDto.setAcceptCarriageEntName(acceptCarriageEnt.getFirmName());
         KwcContractLogisticsGoods goods = contractLogisticsGoodsMap.getOrDefault(log.getId(),
                 new KwcContractLogisticsGoods());

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

@@ -687,10 +687,10 @@ public class KwtWaybillOrderController {
     /**
      * 运单状态统计
      */
-    @GetMapping("/statisticsWaybillOrder")
+    @PostMapping("/statisticsWaybillOrder")
     @Operation(summary = "运单状态统计")
-    public BaseResult<StatisticsWaybillResp> statisticsWaybillOrder() {
-        return BaseResult.success(waybillOrderV1Service.statisticsWaybillOrder());
+    public BaseResult<StatisticsWaybillResp> statisticsWaybillOrder(@RequestBody WaybillOrderReq req) {
+        return BaseResult.success(waybillOrderV1Service.statisticsWaybillOrder(req));
     }
 
     /**

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

@@ -158,4 +158,12 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
                 .orderByDesc(KwtWaybillOrder::getId));
     }
 
+    public List<KwtWaybillOrder> findList(Set<Long> allEnt, Integer status, Set<Long> billOrderIds) {
+        return list(Wrappers.<KwtWaybillOrder>lambdaQuery()
+                .eq(KwtWaybillOrder::getDelFlag,0)
+                .in(KwtWaybillOrder::getEntId,allEnt)
+                .eq(KwtWaybillOrder::getStatus,status)
+                .in(KwtWaybillOrder::getId,billOrderIds)
+                .orderByDesc(KwtWaybillOrder::getId));
+    }
 }

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

@@ -3655,9 +3655,30 @@ public class KwtWaybillOrderV1Service {
         return kwtLogisticsOrder;
     }
 
-    public StatisticsWaybillResp statisticsWaybillOrder() {
-        log.info("运单状态统计");
-        List<KwtWaybillOrder> orders = kwtWaybillOrderRepository.findByEntId(LoginUserHolder.getEntId());
+    public StatisticsWaybillResp statisticsWaybillOrder(@RequestBody WaybillOrderReq req) {
+
+        log.info("运单状态统计：{}",JSON.toJSONString(req));
+        Integer status = org.apache.commons.lang3.StringUtils.isNoneBlank(req.getStatus()) ?
+                Integer.parseInt(req.getStatus()) : null;
+        Set<Long> allEnt = getAllEnt(req);
+        //物流订单号集合
+        Set<Long> logOrderIds = getLogOrderIds(req);
+        boolean b1 = !org.apache.commons.lang3.StringUtils.isAllBlank(req.getLogisticsOrderNo(), req.getGoodsName(),
+                req.getCarrierId(), req.getConsignorId());
+        if(org.apache.commons.collections4.CollectionUtils.isEmpty(logOrderIds) && b1){
+            return new StatisticsWaybillResp();
+        }
+        //查询运单信息
+        //运单id集合
+        Set<Long> billOrderIds = getBillOrderIds(req);
+        boolean b = Stream.of(req.getWaybillNo(), req.getTruckNo(), req.getDriverName(), req.getPhone(),
+                        req.getLoadStartTime(),req.getLoadEndTime(),req.getUnloadStartTime(),req.getUnloadEndTime())
+                .anyMatch(StringUtils::isNotBlank);
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(billOrderIds) && b){
+            return new StatisticsWaybillResp();
+        }
+
+        List<KwtWaybillOrder> orders = kwtWaybillOrderRepository.findList(allEnt,status,billOrderIds);
         List<CarWaybillV1Enum> carWaybillV1Enums = Arrays.stream(CarWaybillV1Enum.values())
                 .sorted(Comparator.comparing(CarWaybillV1Enum::getCode))
                 .collect(Collectors.toList());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -552,7 +552,8 @@ public class WaybillOrderService {
     public StatisticsWaybillResp statisticsWaybillOrder() {
         StatisticsWaybillResp waybillResp = new StatisticsWaybillResp();
         log.info("运单状态统计");
-        StatisticsWaybillResp statisticsWaybillResp = waybillOrderV1Service.statisticsWaybillOrder();
+        WaybillOrderReq waybillOrderReq = new WaybillOrderReq();
+        StatisticsWaybillResp statisticsWaybillResp = waybillOrderV1Service.statisticsWaybillOrder(waybillOrderReq);
         if (statisticsWaybillResp == null || CollectionUtils.isEmpty(statisticsWaybillResp.getOrderStatusStatistics())) {
             return new StatisticsWaybillResp();
         }