提交

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

@@ -787,6 +787,20 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getCapacityDriverList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "展示司机排班信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getCapacityDriverListWithCarNo")
+    public Map<String, Object> getCapacityDriverListWithCarNo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId) {
+        return rmsFeign.getCapacityDriverListWithCarNo(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
     @ApiOperation(value = "创建", notes = "根据RmsDriverCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacityDriver", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
     @PostMapping(value = "/insertCapacityDriver")
@@ -795,6 +809,14 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.insertCapacityDriver(map);
     }
 
+    @ApiOperation(value = "修改", notes = "根据RmsDriverCapacity对象创建")
+    @ApiImplicitParam(name = "rmsCapacityDriver", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
+    @PostMapping(value = "/updateCapacityDriver")
+    @LogAround(foreignKeys = {"capacityDriverId"},foreignKeyTypes = {"司机排班"})
+    public Map<String, Object> updateCapacityDriver(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.updateCapacityDriver(map);
+    }
+
     @ApiOperation(value = "创建", notes = "根据RmsDriverCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacityDriver", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
     @PostMapping(value = "/deleteCapacityDriver")
@@ -1080,6 +1102,13 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.insertCapacityType(map);
     }
 
+    @ApiOperation(value = "新增运力类型")
+    @PostMapping(value = "/updateCapacityType")
+    @LogAround(foreignKeys = {"capacityTypeId"}, foreignKeyTypes = {"运力类型"})
+    public Map<String, Object> updateCapacityType(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.updateCapacityType(map);
+    }
+
     @ApiOperation(value = "删除运力类型")
     @PostMapping(value = "/deleteCapacityType")
     @LogAround(foreignKeys = {"capacityTypeId"}, foreignKeyTypes = {"运力类型"})

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

@@ -322,10 +322,20 @@ public interface RmsFeign {
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize);
 
+    @PostMapping(value = "api/v1/rms/rmscapacitydrivers/getCapacityDriverListWithCarNo")
+    Map<String, Object> getCapacityDriverListWithCarNo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize);
+
     //新增司机排班信息
     @PostMapping(value = "api/v1/rms/rmscapacitydrivers/insertCapacityDriver")
     Map<String, Object> insertCapacityDriver(@RequestBody(required = false) Map<String, Object> map);
 
+    //新增司机排班信息
+    @PostMapping(value = "api/v1/rms/rmscapacitydrivers/updateCapacityDriver")
+    Map<String, Object> updateCapacityDriver(@RequestBody(required = false) Map<String, Object> map);
+
     //删除司机排班信息
     @PostMapping(value = "api/v1/rms/rmscapacitydrivers/deleteCapacityDriver")
     Map<String, Object> deleteCapacityDriver(@RequestBody(required = false) Map<String, Object> map);
@@ -581,6 +591,8 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmscapacitytype/insertCapacityType")
     Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/updateCapacityType")
+    Map<String, Object> updateCapacityType(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteCapacityType")
     Map<String, Object> deleteCapacityType(@RequestBody(required = false) Map<String, Object> map);