提交全图监控

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

@@ -1876,6 +1876,9 @@ public class KwcContractTradeService {
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(kwcContractTrades)){
             return Collections.emptyList();
         }
+        kwcContractTrades = kwcContractTrades.stream()
+                .filter(x-> Objects.equals(x.getStatus(), ContractStatusEnum.SIGNED.getCode()))
+                .collect(Collectors.toList());
         return kwcContractTrades.stream()
                 .map(x-> getContractTradeOrderInfo(x, conTractTradeUnitMap,contractTradeOrderDto.getEntType(),contractGoodsMap))
                 .collect(Collectors.toList());

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

@@ -41,12 +41,17 @@ public class MapVehicleVo implements Serializable {
 
     @Schema(description = "司机手机号")
     private String driverPhone;
+    @Schema(description = "运单ID")
+    private Long wayOrderId;
 
     @Schema(description = "运单号")
-    private String wOrderNo;
+    private String wayOrderNo;
+
+    @Schema(description = "物流订单ID")
+    private Long logisticOrderId;
 
     @Schema(description = "物流订单号")
-    private String lOrderNo;
+    private String logisticOrderNo;
 
     @Schema(description = "托运单位")
     private String consignUnit;

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

@@ -17,7 +17,6 @@ import com.sckw.core.model.enums.CarWaybillV1Enum;
 import com.sckw.core.utils.DateUtils;
 import com.sckw.core.utils.HttpUtil;
 import com.sckw.core.web.constant.CommonConstants;
-import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.core.web.response.BaseResult;
@@ -1134,14 +1133,16 @@ public class kwfTruckTraceService {
         vo.setTruckId(order.getTruckId());
         vo.setDriverName(order.getDriverName());
         vo.setDriverPhone(order.getDriverPhone());
-        vo.setWOrderNo(order.getWOrderNo());
+        vo.setWayOrderId(order.getId());
+        vo.setWayOrderNo(order.getWOrderNo());
         vo.setStatus(order.getStatus());
         vo.setStatusDesc(CarWaybillV1Enum.geDesc(order.getStatus()));
         
         // 子运单信息
         KwtWaybillOrderSubtask subtask = subtaskMap.get(order.getId());
         if (subtask != null) {
-            vo.setLOrderNo(String.valueOf(subtask.getLOrderId()));
+            vo.setLogisticOrderId(subtask.getLOrderId());
+            vo.setLogisticOrderNo(String.valueOf(subtask.getLOrderId()));
             vo.setLoadAmount(subtask.getLoadAmount());
             vo.setEntrustAmount(subtask.getEntrustAmount());
             vo.setUnit(subtask.getUnit());