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

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

@@ -986,6 +986,19 @@ public class RMScontroller {
         return rmsFeign.upLoadPhoto(file);
     }
 
+    //根据运力id查询承运商
+    @PostMapping(value = "getCarrierNameById/{id}")
+    public Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCarrierNameById(id);
+    }
+   //根据司机id查询承运商
+   @PostMapping(value = "getCarrierNameByDriverId/{id}")
+   public Map<String,Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id){
+       return rmsFeign.getCarrierNameByDriverId(id);
+   }
+
+
+
     /*
         txf
      */
@@ -1006,4 +1019,5 @@ public class RMScontroller {
     public Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.deleteShipperResult(map);
     }
+
 }

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

@@ -535,6 +535,13 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscardriver/upload")
     Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file);
 
+    //根据运力id查询承运商名称
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierNameById/{id}")
+    Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id);
+
+    //根据司机id查询承运商名称
+    @PostMapping(value = "api/v1/rms/rmscardriver/getCarrierNameByDriverId/{id}")
+    Map<String,Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id);
 
     @ApiOperation(value="新增组织结构实绩")
     @PostMapping(value = "api/v1/rms/rmsshipper/addShipperResult")
@@ -547,4 +554,5 @@ public interface RmsFeign {
     @ApiOperation(value="修改组织结构实绩")
     @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipperResult")
     Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map);
+
 }