Browse Source

'条件查询'

HUJIANGUO 3 years ago
parent
commit
3eace437a1

+ 5 - 0
src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -1164,4 +1164,9 @@ public class RMScontroller {
     }
 
 
+    //收货客户注册
+    @PostMapping(value = "/signConsignee")
+    public Map<String, Object> signConsignee(@RequestBody Map<String,Object> mapVal){
+        return rmsFeign.signConsignee(mapVal);
+    }
 }

+ 10 - 6
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -117,11 +117,13 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               Integer status,
+                                               @RequestParam(required = false) String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
     }
 
     @PostMapping("getLoadShip/{resultId}")
@@ -336,9 +338,10 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId) {
+                                                         Integer apiId,
+                                                         @RequestParam(required = false) String con) {
 
-        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
     }
 
     @PostMapping("getWaterQuality/{resultId}")
@@ -625,11 +628,12 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageNum,
                                                          Integer pageSize,
                                                          Integer apiId,
-                                                         Integer status) {
+                                                         Integer status,
+                                                         @RequestParam(required = false) String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
     }
 
     @PostMapping("insertDeliveryNotice")

+ 7 - 0
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -845,4 +845,11 @@ public class UniversalController extends BaseRESTfulController {
     public Map<String,Object>getCapacityTel(BigDecimal capacityId){
         return universalMapper.getCapacityTel(capacityId);
     }
+
+    @ApiModelProperty(value = "边输边查收货客户")
+    @PostMapping("/getConsigneeMesByLike")
+    public RESTfulResult getConsigneeMesByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getConsigneeMesByLike(index == null ? "" : index);
+        return success(list);
+    }
 }

+ 3 - 0
src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -637,4 +637,7 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmscargodeps/getCargoDepById/{id}")
     Map<String, Object> getCargoDepById(@PathVariable("id") BigDecimal id);
+
+    @PostMapping("api/v1/rms/rmsconsignee/signConsignee")
+    Map<String, Object> signConsignee(@RequestBody Map<String, Object> mapVal);
 }

+ 7 - 3
src/main/java/com/steerinfo/dil/feign/TmsshipFeign.java

@@ -108,7 +108,9 @@ public interface TmsshipFeign {
     Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
                                   @RequestParam Integer pageNum,
                                   @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId);
+                                  @RequestParam Integer apiId,
+                                        @RequestParam Integer status,
+                                        @RequestParam(required = false) String con);
 
     /**
      * 查询装船作业表单
@@ -324,7 +326,8 @@ public interface TmsshipFeign {
     Map<String, Object> getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId);
+                                            @RequestParam Integer apiId,
+                                                  @RequestParam(required = false) String con);
 
     /**
      * 查询水分质检信息
@@ -711,7 +714,8 @@ public interface TmsshipFeign {
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
-                                            @RequestParam Integer  status);
+                                            @RequestParam Integer  status,
+                                                  @RequestParam(required = false) String con);
 
     /**
      * 新增放货通知

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -194,4 +194,7 @@ public interface UniversalMapper {
 
     //查询运力联系方式
     Map<String, Object> getCapacityTel(BigDecimal capacityId);
+
+    // 边输边查收货客户
+    List<Map<String, Object>> getConsigneeMesByLike(String s);
 }

+ 2 - 2
src/main/resources/application-prod.yml

@@ -9,9 +9,9 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:

+ 11 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -991,4 +991,15 @@
         SELECT RC.CAPACITY_TEL "capacityTel" FROM RMS_CAPACITY RC
         WHERE RC.CAPACITY_ID = #{capacityId}
     </select>
+
+    <select id="getConsigneeMesByLike" resultType="java.util.Map" parameterType="java.lang.String" >
+        select
+            RC.CONSIGNEE_ID "consigneeId",
+            RC.CONSIGNEE_COMPANY_NAME "value",
+            RC.CONSIGNEE_COMPANY_NAME "consigneeName"
+        from RMS_CONSIGNEE RC
+        where
+            instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum &lt; 10
+        order by "value"
+    </select>
 </mapper>