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

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

@@ -461,13 +461,57 @@ public class TMSController extends BaseRESTfulController {
                                                                 Integer pageNum,
                                                                 Integer pageSize,
                                                                 Integer apiId,
-                                                          String con) {
+                                                                String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
         return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
-
+    @PostMapping("getGroupList")
+    @ApiOperation(value = "展示收货人列表")
+    @ApiImplicitParams(
+            @ApiImplicitParam(name="apiId",value="217")
+    )
+    public Map<String, Object> getGroupList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                                Integer pageNum,
+                                                                Integer pageSize,
+                                                                Integer apiId,
+                                                                String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getGroupList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @PostMapping("getMaterialList")
+    @ApiOperation(value = "展示物资列表")
+    @ApiImplicitParams(
+            @ApiImplicitParam(name="apiId",value="216")
+    )
+    public Map<String, Object> getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getMaterialList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
+    @PostMapping("selectShippeByName")
+    @ApiOperation(value = "展示货权转移送达单位列表")
+    @ApiImplicitParams(
+            @ApiImplicitParam(name = "apiId",value = "215")
+    )
+    public Map<String, Object> selectShippeByName(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.selectShippeByName(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
     @PostMapping("insertamsshipCargoTransferResult")
     @ApiOperation(value = "新增货权转移")
     Map<String, Object> insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult) {

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

@@ -546,11 +546,29 @@ public interface TmsshipFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getAmsshipCargoTranferResultList")
     Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   @RequestParam Integer pageNum,
-                                                   @RequestParam Integer pageSize,
-                                                   @RequestParam Integer apiId,
+                                                         @RequestParam Integer pageNum,
+                                                         @RequestParam Integer pageSize,
+                                                         @RequestParam Integer apiId,
                                                          @RequestParam String con);
-
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectShippeByName")
+    Map<String, Object>   selectShippeByName(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam String con);
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getMaterialList")
+       Map<String, Object>  getMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getGroupList")
+      Map<String, Object>      getGroupList (@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam String con);
     /**
      * 新增货权转移
      *