| 
					
				 | 
			
			
				@@ -800,7 +800,7 @@ public class RMScontroller { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //油价 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @ApiOperation(value = "获取公告信息", notes = "分页查询") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @ApiOperation(value = "获取油价信息", notes = "分页查询") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @ApiImplicitParams({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"), 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -850,9 +850,6 @@ public class RMScontroller { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return rmsFeign.getOilPriceById(id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //*******************************下拉框************************ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("getNoticeTypeId") 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -861,6 +858,29 @@ public class RMScontroller { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return rmsFeign.getNoticeTypeId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //展示收货客户信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @ApiOperation(value = "获取公告信息", notes = "分页查询") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @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(value = "/getConsigneeList") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                                     Integer apiId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                                     Integer pageNum, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                                     Integer pageSize, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                                     String con 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return rmsFeign.getConsigneeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("getPortType") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @ApiOperation(value = "得到港口类型Id") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public Map<String,Object> getPortType(){ 
			 |