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

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

@@ -51,12 +51,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer apiId,
-                                                     String con) {
+                                                     Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getBargeOperationList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("selectBargeOperation/{bargeOperationId}")
@@ -115,12 +114,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
+                                               Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getLoadShip/{resultId}")
@@ -212,12 +210,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId,
-                                             String con) {
+                                             Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
 
@@ -225,9 +222,8 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            Integer apiId,
-                                            String con){
-        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+                                            Integer apiId){
+        return  tmsshipFeign.getBatchList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
 
@@ -256,12 +252,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId,
-                                               String con) {
+                                               Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId);
     }
 
     /**
@@ -277,10 +272,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
-                                                 Integer apiId,
-                                                 String con) {
+                                                 Integer apiId) {
 
-        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getUnLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getUnloadShip/{resultId}")
@@ -327,10 +321,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId,
-                                                         String con) {
+                                                         Integer apiId) {
 
-        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("getWaterQuality/{resultId}")
@@ -425,12 +418,11 @@ public class TMSController extends BaseRESTfulController {
                                                            Integer pageNum,
                                                            Integer pageSize,
                                                            Integer apiId,
-                                                           String con,
                                                            String status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
     }
 
     @PostMapping("getShipmentInstructions/{instructionsId}")
@@ -477,12 +469,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                                 Integer pageNum,
                                                                 Integer pageSize,
-                                                                Integer apiId,
-                                                                String con) {
+                                                                Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
     }
     @PostMapping("getGroupList")
     @ApiOperation(value = "展示收货人列表")
@@ -566,12 +557,11 @@ public class TMSController extends BaseRESTfulController {
                                                               Integer pageNum,
                                                               Integer pageSize,
                                                               Integer apiId,
-                                                              String con,
                                                               Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
     }
 
     @PostMapping("insertshipDeliveryAttorney")
@@ -619,12 +609,11 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageNum,
                                                          Integer pageSize,
                                                          Integer apiId,
-                                                         String con,
                                                          Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
     }
 
     @PostMapping("insertDeliveryNotice")

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

@@ -28,8 +28,7 @@ public interface TmsshipFeign {
     Map<String, Object> getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId,
-                                              @RequestParam String con);
+                                        @RequestParam Integer apiId);
 
     /**
      * 查询驳船作业信息
@@ -107,8 +106,7 @@ public interface TmsshipFeign {
     Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                   @RequestParam Integer pageNum,
                                   @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId,
-                                        @RequestParam String con);
+                                  @RequestParam Integer apiId);
 
     /**
      * 查询装船作业表单
@@ -234,8 +232,7 @@ public interface TmsshipFeign {
     Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam Integer pageNum,
                                 @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId,
-                                      @RequestParam String con);
+                                @RequestParam Integer apiId);
 
     /**
      * 展示船只信息
@@ -250,8 +247,7 @@ public interface TmsshipFeign {
     Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId,
-                                        @RequestParam String con);
+                                        @RequestParam Integer apiId);
 
     /**
      * 展示卸船作业信息列表
@@ -266,8 +262,7 @@ public interface TmsshipFeign {
     Map<String, Object> getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam String con);
+                                          @RequestParam Integer apiId);
 
     /**
      * 查询卸船作业信息
@@ -327,8 +322,7 @@ public interface TmsshipFeign {
     Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId,
-                                                  @RequestParam String con);
+                                            @RequestParam Integer apiId);
 
     /**
      * 查询水分质检信息
@@ -441,7 +435,6 @@ public interface TmsshipFeign {
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer apiId,
-                                                    @RequestParam String con,
                                                     @RequestParam String status);
 
     /**
@@ -543,8 +536,7 @@ public interface TmsshipFeign {
     Map<String, Object> getBatchList(@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam String con);
+                                     @RequestParam Integer apiId);
 
 
 
@@ -572,8 +564,7 @@ public interface TmsshipFeign {
     Map<String, Object> getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          @RequestParam Integer pageNum,
                                                          @RequestParam Integer pageSize,
-                                                         @RequestParam Integer apiId,
-                                                         @RequestParam String con);
+                                                         @RequestParam Integer apiId);
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectShippeByName")
     Map<String, Object>   selectShippeByName(@RequestBody(required = false) Map<String, Object> mapValue,
                                              @RequestParam Integer pageNum,
@@ -643,7 +634,6 @@ public interface TmsshipFeign {
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
                                                  @RequestParam Integer apiId,
-                                                 @RequestParam String con,
                                                  @RequestParam Integer status);
 
     /**
@@ -705,7 +695,6 @@ public interface TmsshipFeign {
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
-                                            @RequestParam String con,
                                             @RequestParam Integer  status);
 
     /**

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -156,8 +156,8 @@
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName",
                         RC.INSERT_UPDATE_REMARK "remark"
-                 FROM RMS_CAPACITY RC
-                            LEFT JOIN RMS_CAPACITY_CARRIER RCC
+                 FROM RMS_CAPACITY_CARRIER RCC
+                            LEFT JOIN RMS_CAPACITY RC
                      ON RCC.CAPACITY_ID = RC.CAPACITY_ID
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RCC.CARRIER_ID