Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -70,6 +70,16 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.deleteLine(mapVal);
     }
 
+    @ApiOperation(value = "审批/拒审运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/approveTransLine")
+    @LogAround(foreignKeys = {"lineId"}, foreignKeyTypes = {"运输路线"})
+    public Map<String, Object> approveTransLine(@RequestBody(required = false) Map<String, Object> mapVal) {
+        return rmsFeign.approveTransLine(mapVal);
+    }
+
     @ApiOperation(value = "根据id查询线路详情", notes = "")
     @ApiImplicitParam(name = "rmsLineStep", value = "rmsLineStep", required = true, dataType = "rmsLineStep")
     @PostMapping(value = "/getRmsLineStep/{id}")
@@ -400,6 +410,16 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.updatePersonnel(map);
     }
 
+    @ApiOperation(value = "审批/拒审人员（司机）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "人员", required = false, dataType = "Map"),
+    })
+    @PostMapping("/approvePersonnel")
+    @LogAround(foreignKeys = {"personnelId"}, foreignKeyTypes = {"人员"})
+    public Map<String, Object> approvePersonnel(@RequestBody(required = false) Map<String, Object> mapVal) {
+        return rmsFeign.approvePersonnel(mapVal);
+    }
+
     @ApiOperation(value = "根据id更新详细人员信息", notes = "根据rmsPersonnel对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/getPersonnelById")
@@ -561,6 +581,16 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.deleteCapacity(map);
     }
 
+    @ApiOperation(value = "审批/拒审运力")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运力", required = false, dataType = "Map"),
+    })
+    @PostMapping("/approveCapacity")
+    @LogAround(foreignKeys = {"capacityId"}, foreignKeyTypes = {"运力"})
+    public Map<String, Object> approveCapacity(@RequestBody(required = false) Map<String, Object> mapVal) {
+        return rmsFeign.approveCapacity(mapVal);
+    }
+
     @ApiOperation(value = "获取运力详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/getCapacityById")

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

@@ -27,6 +27,9 @@ public interface RmsFeign {
     @PostMapping("/api/v1/rms/rmslines/deleteLine")
     Map<String, Object> deleteLine(@RequestBody(required = false) Map<String, Object> mapVal);
 
+    @PostMapping("/api/v1/rms/rmslines/approveTransLine")
+    Map<String, Object> approveTransLine(@RequestBody(required = false) Map<String, Object> mapVal);
+
     @PostMapping(value = "/api/v1/rms/rmslines/getLineList")
     Map<String, Object> getLineList(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam("pageNum") Integer pageNum,
@@ -176,6 +179,9 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmspersonnel/updatePersonnel")
     Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/rms/rmspersonnel/approvePersonnel")
+    Map<String, Object> approvePersonnel(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelById")
     Map<String, Object> getPersonnelById(@RequestBody(required = false) Map<String, Object> map);
 
@@ -235,6 +241,9 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscapacity/updateCapacity")
     Map<String, Object> updateCapacity(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/rms/rmscapacity/approveCapacity")
+    Map<String, Object> approveCapacity(Map<String, Object> map);
+
 
     //模糊查询运力
     @PostMapping(value = "/api/v1/rms/rmscapacity/getCapacityList")