Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1099,4 +1099,10 @@ public class RMScontroller {
     public Map<String, Object> oilNameSelect(){
         return rmsFeign.oilNameSelect();
     }
+
+    @ApiOperation("解除承运商和车辆的绑定关系")
+    @PostMapping("/deleteCapacityCarrier")
+    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
+    }
 }

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

@@ -1427,9 +1427,11 @@ public class TMSController extends BaseRESTfulController {
                                                      String con,
                                                      String carrierSsoId,
                                                      String userId,
-                                                     String userIds
+                                                     String userIds,
+                                                     String startTime,
+                                                     String endTime
     ){
-        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId,userId,userIds);
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderType, con, carrierSsoId,userId,userIds,startTime,endTime);
     }
 
 

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

@@ -601,5 +601,7 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsoilprice/oilNameSelect")
     Map<String, Object> oilNameSelect();
 
-
+    @ApiOperation("解除承运商和车辆的绑定关系")
+    @PostMapping("api/v1/rms/rmscapacity/deleteCapacityCarrier")
+    public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map);
 }

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

@@ -207,7 +207,9 @@ public interface TmsTruckFeign {
                                                @RequestParam("con") String con,
                                                @RequestParam("carrierSsoId")String carrierSsoId,
                                                @RequestParam("userId") String userId,
-                                               @RequestParam("userIds") String userIds
+                                               @RequestParam("userIds") String userIds,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime
     );
 
     @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")