Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -799,7 +799,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
     ) {
         int count = 0;
         if (orderType != null) {
-            mapValue.put("orderType", orderType);
+            mapValue.put("orderTypee", orderType);
             count++;
         }
 

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

@@ -171,7 +171,7 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
                                            Integer pageSize,
                                            Integer type,
                                            Integer orderStatus,
-                                           Integer carrierId,
+                                           String carrierId,
                                            String  con) {
         int count = 0;
         if (orderStatus != null) {
@@ -182,7 +182,7 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
             mapValue.put("type", type);
             count++;
         }
-        if (carrierId != null) {
+        if (carrierId != null && !"undefined".equals(carrierId)) {
             mapValue.put("carrierId", carrierId);
             count++;
         }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -47,7 +47,11 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     @Autowired
     IMFeign imFeign;
 
-    //通过线路子表路线图生成各实绩
+    /**
+     * 通过线路子表路线图生成各实绩
+     * @param map
+     * @return
+     */
     public int addAllSonResult(Map<String, Object> map){
         Integer resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId")).intValue();
         Integer lineId = DataChange.dataToBigDecimal(map.get("lineId")).intValue();

src/main/resources/bootstrap.yml

@@ -45,7 +45,7 @@ redis:
 
 #feign设置
 openfeign:
-#正式环境
+  #正式环境
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
@@ -56,7 +56,7 @@ openfeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
 
 
-    #测试环境
+  #测试环境
 #  ColumnDataFeign:
 #    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
 #  TmsTruckFeign:

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

@@ -1658,7 +1658,7 @@
         ASO.SALE_NUMBER "saleNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-        RRA.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
+        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN "addressDeliveryAddress",
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
         RS.SHIPPER_NAME "shipperName",
@@ -1683,8 +1683,8 @@
             <if test="carrierId!=null">
                 and RC.CARRIER_ID = #{carrierId}
             </if>
-            <if test="orderType!=null">
-                and OO.ORDER_TYPE=#{orderType}
+            <if test="orderTypee!=null">
+                and OO.ORDER_TYPE=#{orderTypee}
             </if>
         </where>
         )
@@ -1706,28 +1706,10 @@
                     "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="materialName != null">
-                and
-                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
-                    "materialName" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="orderMaterialweight != null">
-                and
-                <foreach collection="orderMaterialweight" item="item" open="(" separator="or" close=")">
-                    "orderMaterialweight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="orderMaterialweight != null">
-                and
-                <foreach collection="orderMaterialweight" item="item" open="(" separator="or" close=")">
-                    "orderMaterialweight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="consigneeCompanyName != null">
+            <if test="shipperName != null">
                 and
-                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
-                    "consigneeCompanyName" like '%${item}%'
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
                 </foreach>
             </if>
             <if test="consigneeCompanyName != null">

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

@@ -409,7 +409,8 @@
                 and OO.ORDER_TYPE = 14
             </if>
             <if test="carrierId != null">
-                and ASO.CARRIER_ID = #{carrierId}
+                and ASO.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
+                where rc.carrier_sso_id= #{carrierId})
             </if>
         </where>
         )