采购汽运整合完毕

src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -40,8 +40,9 @@ public class OMSController {
                                           Integer pageSize,
                                           Integer orderStatus,
                                           Integer planId,
-                                          Integer orderType) {
-        return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderStatus, planId, orderType);
+                                          Integer orderType,
+                                                Integer fuelOrder) {
+        return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderStatus, planId, orderType, fuelOrder);
     }
 
     @ApiOperation(value = "不适用表头返回数据")
@@ -49,8 +50,8 @@ public class OMSController {
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
     })
     @PostMapping("/getAllTruckOrderReturnListMap")
-    public Map<String, Object> getAllTruckOrder(Integer orderStatus, Integer planId, Integer orderType) {
-        return omsFeign.getAllTruckOrder(orderStatus, planId, orderType);
+    public Map<String, Object> getAllTruckOrderReturnListMap(Integer orderStatus, Integer planId, Integer orderType) {
+        return omsFeign.getAllTruckOrderReturnListMap(orderStatus, planId, orderType);
     }
 
     @ApiOperation(value = "查询所有空闲的运力信息")
@@ -194,9 +195,10 @@ public class OMSController {
                                               Integer pageSize,
                                               @PathVariable Integer orderReceiveStatus,
                                               Integer orderType,
-                                              Integer orderStatus){
+                                              Integer orderStatus,
+                                                    Integer fuelOrder){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderReceiveStatus, orderType, orderStatus);
+                orderReceiveStatus, orderType, orderStatus, fuelOrder);
     }
 
     /**

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -26,10 +26,12 @@ public interface OmsFeign {
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("orderStatus") Integer orderStatus,
                                           @RequestParam("planId") Integer planId,
-                                          @RequestParam("orderType") Integer orderType);
+                                          @RequestParam("orderType") Integer orderType,
+                                          @RequestParam("fuelOrder") Integer fuelOrder
+                                                );
 
     @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
-    public Map<String, Object> getAllTruckOrder(
+    public Map<String, Object> getAllTruckOrderReturnListMap(
             @RequestParam("orderStatus") Integer orderStatus,
             @RequestParam("planId") Integer planId,
             @RequestParam("orderType") Integer orderType);
@@ -92,7 +94,8 @@ public interface OmsFeign {
                                               @RequestParam("pageSize") Integer pageSize,
                                               @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
                                               @RequestParam("orderType") Integer orderType,
-                                              @RequestParam("orderStatus") Integer orderStatus);
+                                              @RequestParam("orderStatus") Integer orderStatus,
+                                                    @RequestParam("fuelOrder") Integer fuelOrder);
     /**
      * 展示承运商接收销售公司已接受的销售订单
      * @param carrierId