提交

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

@@ -114,6 +114,17 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getMaterialTypeList(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
     }
 
+    @PostMapping("/getMaterialTypeListByCompany")
+    @ApiOperation(value = "查询物资种类列表")
+    public Map<String, Object> getMaterialTypeListByCompany(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   String con) {
+
+        return rmsFeign.getMaterialTypeListByCompany(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId, con);
+    }
+
     @ApiOperation("新增物资类型")
     @PostMapping("/insertMaterialType")
     @LogAround(foreignKeys = {"materialTypeId"}, foreignKeyTypes = "物资类型", description = "新增物资类型")
@@ -546,6 +557,20 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getCompanyList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "展示公司信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCompanyListNoPage")
+    public Map<String, Object> getCompanyListNoPage(@RequestBody(required = false) Map<String, Object> mapValue
+    ) {
+        return rmsFeign.getCompanyListNoPage(mapValue == null ? new HashMap<>() : mapValue);
+    }
+
     @ApiOperation(value = "新增公司信息", notes = "根据rmsCompany对象创建")
     @ApiImplicitParam(name = "rmsCompany", value = "详细实体rmsCompany", required = true, dataType = "rmsCompany")
     @PostMapping(value = "/insertCompany")
@@ -1074,6 +1099,18 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getTransRangeList(map, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "查询运输范围")
+    @PostMapping("/getTransRangeListByCompany")
+    public Map<String, Object> getTransRangeListByCompany(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        return rmsFeign.getTransRangeListByCompany(map, apiId, pageNum, pageSize);
+    }
+
     @ApiOperation(value = "新增运输范围")
     @PostMapping(value = "/insertTransRange")
     @LogAround(foreignKeys = {"transRangeId"}, foreignKeyTypes = "运输范围")
@@ -1364,6 +1401,20 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getBusinessType(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "业务类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getBusinessTypeByCompany")
+    public Map<String, Object> getBusinessTypeByCompany(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize) {
+        return rmsFeign.getBusinessTypeByCompany(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
 
     @ApiOperation(value="新增业务类型")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
@@ -1586,4 +1637,14 @@ public class RMScontroller extends BaseRESTfulController {
     ) {
         return rmsFeign.getBusinessTypeControl(mapValue);
     }
+
+    @PostMapping(value = "/relevance")
+    public Map<String, Object> relevance(@RequestBody HashMap<String,Object> map){
+        return rmsFeign.relevance(map);
+    }
+
+    @PostMapping(value = "/cancelRelevance")
+    public Map<String, Object> cancelRelevance(@RequestBody HashMap<String,Object> map){
+        return rmsFeign.cancelRelevance(map);
+    }
 }

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

@@ -82,6 +82,12 @@ public interface RmsFeign {
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
                                             @RequestParam String con);
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeListByCompany")
+    Map<String, Object> getMaterialTypeListByCompany(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
 
     //新增物资种类
     @PostMapping("api/v1/rms/rmsmaterialtype/insertMaterialType")
@@ -218,6 +224,9 @@ public interface RmsFeign {
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize);
 
+    @PostMapping(value = "api/v1/rms/rmscompany/getCompanyListNoPage")
+    Map<String, Object> getCompanyListNoPage(@RequestBody(required = false) Map<String, Object> mapValue);
+
     //新增公司
     @PostMapping(value = "api/v1/rms/rmscompany/insertCompany")
     Map<String, Object> insertCompany(@RequestBody(required = false) Map<String, Object> map);
@@ -582,6 +591,12 @@ public interface RmsFeign {
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize);
+    //运输范围
+    @PostMapping(value = "/api/v1/rms/rmstransrange/getTransRangeListByCompany")
+    Map<String, Object> getTransRangeListByCompany(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize);
 
 
     @PostMapping(value = "api/v1/rms/rmstransrange/insertTransRange")
@@ -698,6 +713,10 @@ public interface RmsFeign {
     Map<String, Object> getBusinessType(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize);
+    @PostMapping("/api/v1/rms/dilbusinesstypes/getBusinessTypeByCompany")
+    Map<String, Object> getBusinessTypeByCompany(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/rms/dilbusinesstypes/insertBusinessType")
     Map<String, Object> insertBusinessType(@RequestBody(required = false) Map<String, Object> map);
@@ -807,6 +826,10 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsbusinesstypecontrols/getBusinessTypeControl")
     Map<String, Object> getBusinessTypeControl(@RequestBody(required = false) Map<String, Object> mapValue);
+    @PostMapping(value = "api/v1/rms/rmscompanybmts/relevance")
+    Map<String, Object> relevance(@RequestBody(required = false) Map<String, Object> mapValue);
+    @PostMapping(value = "api/v1/rms/rmscompanybmts/cancelRelevance")
+    Map<String, Object> cancelRelevance(@RequestBody(required = false) Map<String, Object> mapValue);
 }