tiujiap

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

@@ -83,7 +83,8 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
                                                Integer issueStatus,
                                                String con,
                                                Integer dispatchStatus,
-                                               Integer sporadicStatus) {
+                                               Integer sporadicStatus,
+                                               String carrierSsoId) {
         if (con != null && !con.equals("undefined")) {
             String index="get_sporadic_order_list";//设置要查询的索引名称
             return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
@@ -105,6 +106,10 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
             mapValue.put("sporadicStatus",sporadicStatus);
             count++;
         }
+        if (carrierSsoId!=null){
+            mapValue.put("carrierSsoId",carrierSsoId);
+            count++;
+        }
         List<Map<String, Object>> sporadicOrderList = null;
         if (mapValue.size() == count) {
             //将查询结果存入索引中

src/main/resources/bootstrap.yml

@@ -3,20 +3,19 @@ spring:
   profiles:
     include: ${SPRING_PROFILES:prod}
   jackson:
-      date-format: yyyy-MM-dd HH:mm:ss
-      time-zone: GMT+8
-#    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  #    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
   messages:
     basename: message
     encoding: UTF-8
   mvc:
     static-path-pattern:
-
 #eureka设置
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -468,7 +468,8 @@
         RCA.CARRIER_NAME AS "carrierName",
         ASO.INSERT_TIME AS "insertTime",
         OO.ORDER_TYPE AS "type",
-        OO.ORDER_ID "orderId"
+        OO.ORDER_ID "orderId",
+        RM.MATERIAL_NAME "materialName"
         FROM AMSTRUCK_SPORADIC_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RCO
         ON ASO.RECEIVE_UNIT_ID = RCO.CONSIGNEE_ID
@@ -478,6 +479,11 @@
         ON RCA.CARRIER_ID = ASO.CARRIER_ID
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON
+        OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         WHERE OO.ORDER_TYPE in (12,13)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
@@ -555,6 +561,12 @@
             <if test="dispatchStatus != null">
                 AND ASO.DISPATCH_STATUS =  #{dispatchStatus}
             </if>
+            <if test="carrierSsoId != null">
+                and aso.carrier_id =
+                (select rce.carrier_id
+                from rms_carrier rce
+                where rce.carrier_sso_id = #{carrierSsoId})
+            </if>
             )
         <where>
             <if test="sporadicOrderNo != null">