'销售页面查询框'

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

@@ -610,7 +610,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (con != null && con.length() != 0) {
             mapValue.put("con", "%" + con + "%");
         }
-        mapValue.put("carrierSsoId",carrierSsoId);
+        if (carrierSsoId != null && !"".equals(carrierSsoId) && !"null".equals(carrierSsoId)) {
+            mapValue.put("carrierSsoId", carrierSsoId);
+        }
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据

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

@@ -1091,9 +1091,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 
     @Override
     public List<Map<String, Object>> selectTransportOrderForSale(Map<String, Object> map) {
-        String carrierSsoId = (String) map.get("carrierSsoId");
-        BigDecimal carrierId = omstruckOrderMapper.getCarrierIdBySSO(carrierSsoId);
-        map.put("carrierId",carrierId);
         List<Map<String, Object>> mapList = omstruckOrderMapper.selectTransportOrderForSale(map);
         int count = 1;
         for (Map<String, Object> stringObjectMap : mapList) {

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

@@ -1841,16 +1841,18 @@
         ON OO.CAPACITY_ID=RC.CAPACITY_ID
         LEFT JOIN RMS_SHIPPER RS
         ON RS.SHIPPER_ID=ASO.SHIPPER_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
-        ON RRA.ADDRESS_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
         ON OO.PRICE_ID=ACTP.PRICE_ID
         <where>
             <if test="orderStatus!=null">
                 AND OO.ORDER_STATUS = #{orderStatus}
             </if>
-            <if test="carrierId!=null">
-                and RC3.CARRIER_ID = #{carrierId}
+            <if test="carrierSsoId!=null">
+                and RC3.CARRIER_SSO_ID = #{carrierSsoId}
             </if>
             <if test="orderTypee!=null">
                 and OO.ORDER_TYPE = #{orderTypee}
@@ -1862,7 +1864,7 @@
         </where>
         ) RRC
         <if test="con != null">
-            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con}
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con} or RRC."carrierName" LIKE #{con}
         </if>
         )
         <where>