提交合同查询接口

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/repository/KwcContractLogisticsRepository.java

@@ -33,7 +33,7 @@ public class KwcContractLogisticsRepository extends ServiceImpl<KwcContractLogis
                 .like(StringUtils.isNotBlank(contractName), KwcContractLogistics::getName, contractName)
                 .eq(StringUtils.isNotBlank(status), KwcContractLogistics::getStatus, status)
                 .in(CollectionUtils.isNotEmpty(contractIds), KwcContractLogistics::getId, contractIds)
-                .orderByDesc(KwcContractLogistics::getCreateTime)
+                .orderByDesc(KwcContractLogistics::getUpdateTime)
                 .orderByDesc(KwcContractLogistics::getId));
     }
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/repository/KwcContractTradeRepository.java

@@ -71,7 +71,9 @@ public class KwcContractTradeRepository extends ServiceImpl<KwcContractTradeMapp
                 .eq(Objects.nonNull(status),KwcContractTrade::getStatus, status)
                 .like(StringUtils.isNotBlank(supplementCode),KwcContractTrade::getContractPid, supplementCode)
                 .in(CollectionUtils.isNotEmpty(contractIds),KwcContractTrade::getId, contractIds)
-                .in(CollectionUtils.isNotEmpty(authEntIdList),KwcContractTrade::getEntId, authEntIdList));
+                .in(CollectionUtils.isNotEmpty(authEntIdList),KwcContractTrade::getEntId, authEntIdList)
+                .orderByDesc(KwcContractTrade::getUpdateTime)
+                .orderByDesc(KwcContractTrade::getId));
 
     }
 

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

@@ -124,6 +124,10 @@ public class WaybillOrderDetailResp implements Serializable {
      */
     @Schema(description = "单据信息")
     private BillInfo billInfo;
+    /**
+     * 运单id列表
+     */
+    private List<Long> billOrderIdList;
     @Data
     public static class WeighingRecord implements Serializable{
         @Serial

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

@@ -51,7 +51,7 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
                         .like(StringUtils.isNotBlank(orderNo),KwtLogisticsOrder::getLOrderNo, orderNo)
                         .ge(StringUtils.isNotBlank(startTime),KwtLogisticsOrder::getLoadTime, startTime)
                         .le(StringUtils.isNotBlank(startTime),KwtLogisticsOrder::getUnloadTime, endTime)
-                        .orderByDesc(KwtLogisticsOrder::getCreateTime)
+                        .orderByDesc(KwtLogisticsOrder::getUpdateTime)
                         .orderByDesc(KwtLogisticsOrder::getId)
         );
     }

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

@@ -128,6 +128,8 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
         return list(Wrappers.<KwtWaybillOrder>lambdaQuery()
                 .eq(KwtWaybillOrder::getDelFlag,0)
                 .in(KwtWaybillOrder::getId, wayBillOrderIds)
+                .orderByDesc(KwtWaybillOrder::getUpdateTime)
+                .orderByDesc(KwtWaybillOrder::getId)
         );
     }
 

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

@@ -75,7 +75,7 @@ public class KwtWaybillOrderSubtaskRepository extends ServiceImpl<KwtWaybillOrde
                         .in(CollectionUtils.isNotEmpty(entIds),KwtWaybillOrderSubtask::getEntId, entIds)
                         .in(CollectionUtils.isNotEmpty(logOrderIds),KwtWaybillOrderSubtask::getLOrderId, logOrderIds)
                         .in(CollectionUtils.isNotEmpty(billOrderIds),KwtWaybillOrderSubtask::getWOrderId, billOrderIds)
-                        .orderByDesc(BaseModel::getCreateTime)
+                        .orderByDesc(BaseModel::getUpdateTime)
                         .orderByDesc(KwtWaybillOrderSubtask::getId));
     }
 

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

@@ -3331,8 +3331,20 @@ public class KwtWaybillOrderV1Service {
 
         //查询用户
         UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(subtask.getUnloadOperator());
+        //根据物流订单查询运单号
+        List<KwtWaybillOrderSubtask> waybillOrderSubtasks = kwtWaybillOrderSubtaskRepository.queryByLogId(logOrder.getId());
+        List<KwtWaybillOrder> billOrders = Lists.newArrayList() ;
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(waybillOrderSubtasks)){
+            Set<Long> billOrderIds = waybillOrderSubtasks.stream()
+                    .map(KwtWaybillOrderSubtask::getWOrderId)
+                    .collect(Collectors.toSet());
+            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(billOrderIds)){
+                billOrders = kwtWaybillOrderRepository.queryByBillOrderIds(billOrderIds);
+            };
+        }
+
         return getWaybillOrderDetailResp( subtask,billOrder, logOrder, truck, fleet, goods,
-                keyAndAddressMap,kwpGoods,logisticsOrderUnitMap,nodeList,userCacheResDto);
+                keyAndAddressMap,kwpGoods,logisticsOrderUnitMap,nodeList,userCacheResDto,billOrders);
     }
 
     @NotNull
@@ -3345,7 +3357,8 @@ public class KwtWaybillOrderV1Service {
                                                                      KwpGoods kwpGoods,
                                                                      Map<String, KwtLogisticsOrderUnit> logisticsOrderUnitMap,
                                                                      List<KwtWaybillOrderNode> nodeList,
-                                                                     UserCacheResDto userCacheResDto) {
+                                                                     UserCacheResDto userCacheResDto,
+                                                                     List<KwtWaybillOrder> billOrders) {
         WaybillOrderDetailResp waybillOrderDetailResp = new WaybillOrderDetailResp();
         waybillOrderDetailResp.setWaybillOrderId(String.valueOf(billOrder.getId()));
         waybillOrderDetailResp.setWaybillOrderNo(billOrder.getWOrderNo());
@@ -3394,6 +3407,13 @@ public class KwtWaybillOrderV1Service {
         billInfo.setUploadTime(DateUtils.format(subtask.getUnloadUploadTime(),DateUtils.DATE_TIME_PATTERN));
         billInfo.setBillUrl(subtask.getUnloadUrl());
         waybillOrderDetailResp.setBillInfo(billInfo);
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(billOrders)){
+            List<Long> billOrderIdList = billOrders.stream()
+                    .filter(b -> Objects.equals(b.getStatus(), CarWaybillV1Enum.COMPLETION_LOADING.getCode()))
+                    .map(KwtWaybillOrder::getId)
+                    .collect(Collectors.toList());
+            waybillOrderDetailResp.setBillOrderIdList(billOrderIdList);
+        }
         return waybillOrderDetailResp;
     }
 
@@ -3490,6 +3510,11 @@ public class KwtWaybillOrderV1Service {
 
     private void saveNode(KwtWaybillOrder billOrder, KwtWaybillOrderSubtask subtask, Integer status,String remark) {
         KwtWaybillOrderNode kwtWaybillOrderNode = new KwtWaybillOrderNode();
+        kwtWaybillOrderNode.setTruckId(billOrder.getTruckId());
+        kwtWaybillOrderNode.setTruckNo(billOrder.getTruckNo());
+        kwtWaybillOrderNode.setDriverId(billOrder.getDriverId());
+        kwtWaybillOrderNode.setDriverName(billOrder.getDriverName());
+
         kwtWaybillOrderNode.setWOrderId(billOrder.getId());
         kwtWaybillOrderNode.setWSubtaskId(subtask.getId());
         kwtWaybillOrderNode.setOrderStatus(status);