|
@@ -732,14 +732,7 @@ public class WaybillOrderService {
|
|
|
//状态
|
|
//状态
|
|
|
wbOrderResp.setStatus(wbOrder.getStatus());
|
|
wbOrderResp.setStatus(wbOrder.getStatus());
|
|
|
// 使用已定义的常量集合来判断状态
|
|
// 使用已定义的常量集合来判断状态
|
|
|
- List<Integer> statusList = Arrays.asList(
|
|
|
|
|
- CarWaybillV1Enum.PENDING_VEHICLE.getCode(),
|
|
|
|
|
- CarWaybillV1Enum.REFUSE_TRAFFIC.getCode(),
|
|
|
|
|
- CarWaybillV1Enum.EXIT_COMPLETED.getCode(),
|
|
|
|
|
- CarWaybillV1Enum.WAIT_LOADING.getCode(),
|
|
|
|
|
- CarWaybillV1Enum.WEIGHT_TRAFFIC.getCode(),
|
|
|
|
|
- CarWaybillV1Enum.WAIT_LOADING.getCode());
|
|
|
|
|
- if (statusList.contains(wbOrder.getStatus())) {
|
|
|
|
|
|
|
+ if (UNDER_WAY.contains(wbOrder.getStatus())) {
|
|
|
wbOrderResp.setStatusDesc("进行中");
|
|
wbOrderResp.setStatusDesc("进行中");
|
|
|
} else if (Objects.equals(wbOrder.getStatus(), CarWaybillV1Enum.COMPLETION_LOADING.getCode())) {
|
|
} else if (Objects.equals(wbOrder.getStatus(), CarWaybillV1Enum.COMPLETION_LOADING.getCode())) {
|
|
|
wbOrderResp.setStatusDesc("待审核");
|
|
wbOrderResp.setStatusDesc("待审核");
|