修改查询条件

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

@@ -341,7 +341,8 @@ public class AMScontroller{
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId,
-                                              String con,String sendCompId) {
+                                              String con,
+                                                    String sendCompId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }

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

@@ -281,10 +281,11 @@ public interface AmsFeign {
      */
     @PostMapping(value = "/api/v1/ams/amspurchaseorders/getPurchaseOrderList")
     Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam Integer pageNum,
-                                       @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId, @RequestParam String con,
-                                       @RequestParam String sendCompId
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con,
+                                       @RequestParam("sendCompId") String sendCompId
                                              );
 
 

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -22,15 +22,15 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:localhost:8003}
+    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -12,6 +12,7 @@ spring:
   mvc:
     static-path-pattern:
 
+
 #eureka设置
 eureka:
   client:
@@ -21,7 +22,6 @@ eureka:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-
 genxml:
   pth: com/a
 cache:

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

@@ -165,7 +165,7 @@
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
             <if test="index != null">
-                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
+                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0 or  instr(RC.INSERT_UPDATE_REMARK, #{index})>0)
             </if>
             <if test="con != null">
                 and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0