修改

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

@@ -585,22 +585,18 @@ public class OmstruckOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping("/getDriverInfoForSale")
-    public RESTfulResult getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer orderType,
-                                              Integer orderStatus,
-                                              String con,
-                                              String carrierSsoId,
-                                              Integer shipperId
-    ) {
-        if (orderType != null) {
-            mapValue.put("orderTypee", orderType);
-        }
-        if (shipperId != null) {
-            mapValue.put("shipperId",shipperId);
+        public RESTfulResult getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
+                Integer apiId,
+                Integer pageNum,
+                Integer pageSize,
+                Integer orderStatus,
+                String con,
+                Integer saleOrderId
+    ) { if (saleOrderId != null ) {
+            mapValue.put("saleOrderId", saleOrderId);
         }
+
+
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
         }
@@ -610,9 +606,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (con != null && con.length() != 0) {
             mapValue.put("con", "%" + con + "%");
         }
-        if (carrierSsoId != null && !"".equals(carrierSsoId) && !"null".equals(carrierSsoId)) {
-            mapValue.put("carrierSsoId", carrierSsoId);
-        }
+
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -621,6 +615,35 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @PostMapping("/getDriverInfoForSale1")
+    public RESTfulResult getDriverInfoForSale1(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer orderStatus,
+                                              String con,
+                                              Integer saleOrderId,
+                                               String numberPlate
+    ) { if (saleOrderId != null ) {
+        mapValue.put("saleOrderId", saleOrderId);
+        }
+
+        if (orderStatus != null) {
+            mapValue.put("orderStatus", orderStatus);
+        }
+        if (con != null && (con.equals("") || con.equals("undefined"))) {
+            con = null;
+        }
+        if (con != null && con.length() != 0) {
+            mapValue.put("con", "%" + con + "%");
+        }
+        if (numberPlate != null&& !"".equals(numberPlate)&&!"null".equals(numberPlate)) {
+            mapValue.put("numberPlate", orderStatus);
+        }
+
+
+        List<Map<String, Object>> result = omstruckOrderService.selectTransportOrderForSale1(mapValue);
+
+        return success(result);
+    }
+
 
     @ApiOperation(value = "司机APP端调用接口查询数据 4 已下发 5 已接收")
     @ApiImplicitParams({

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -144,6 +144,8 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //销售：接收运输订单展示pc端界面
     List<Map<String, Object>> selectTransportOrderForSale(Map<String, Object> map);
 
+    List<Map<String, Object>> selectTransportOrderForSale1(Map<String, Object> map);
+
     //销售：根据承运商查找承运商
     List<Map<String, Object>> selectSaleMaterialIdByCarrierId(Integer carrierId);
 

src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -119,6 +119,8 @@ public interface IOmstruckOrderService {
     //销售：接收运输订单展示pc端界面
     List<Map<String, Object>> selectTransportOrderForSale(Map<String, Object> map);
 
+    List<Map<String, Object>> selectTransportOrderForSale1(Map<String, Object> map);
+
     //根据承运商查找销售订单
     List<Map<String, Object>> selectSteelSaleForCarrier(Map<String, Object> map);
 

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

@@ -9,7 +9,6 @@ import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
 import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
 import com.steerinfo.dil.util.DataChange;
-import com.sun.corba.se.spi.ior.ObjectKey;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1099,6 +1099,17 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return mapList;
     }
 
+    @Override
+    public List<Map<String, Object>> selectTransportOrderForSale1(Map<String, Object> map) {
+        List<Map<String, Object>> mapList = omstruckOrderMapper.selectTransportOrderForSale1(map);
+        int count = 1;
+        for (Map<String, Object> stringObjectMap : mapList) {
+            stringObjectMap.put("ROW_ID",count);
+            count ++;
+        }
+        return mapList;
+    }
+
     @Override
     public List<Map<String, Object>> selectSteelSaleForCarrier(Map<String, Object> map) {
         return omstruckOrderMapper.selectSteelSaleForCarrier(map);

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

@@ -1825,7 +1825,10 @@
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
         RS.SHIPPER_NAME "shipperName",
         OO.ORDER_ID "orderId",
-        RC3.CARRIER_NAME "carrierName"
+        RC3.CARRIER_NAME "carrierName",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -1847,20 +1850,126 @@
         ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
         ON OO.PRICE_ID=ACTP.PRICE_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID=ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         <where>
             <if test="orderStatus!=null">
                 AND OO.ORDER_STATUS = #{orderStatus}
             </if>
-            <if test="carrierSsoId!=null">
-                and RC3.CARRIER_SSO_ID = #{carrierSsoId}
+
+            <if test="saleOrderId!=null">
+                AND ASO.SALE_ORDER_ID = #{saleOrderId}
             </if>
-            <if test="orderTypee!=null">
-                and OO.ORDER_TYPE = #{orderTypee}
+        </where>
+        ) RRC
+        <if test="con != null">
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con} or RRC."carrierName" LIKE #{con}
+        </if>
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleNumber != null">
+                and
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
             </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderNumber" desc
+        </if>
+    </select>
 
-            <if test="shipperId!=null">
-                and ASO.SHIPPER_ID = #{shipperId}
+    <select id="selectTransportOrderForSale1" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT *from(
+        select
+        OO.ORDER_NUMBER "orderNumber",
+        ASO.SALE_NUMBER "saleNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN
+        ||RRP.ADDRESS_DELIVERY_ADDRESS "completeAddress",
+        ASOM.SALE_SHIPPING_ADDRESS_ID "addressId",
+        ACTP.PRICE_VALUE "priceValue",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RS.SHIPPER_NAME "shipperName",
+        OO.ORDER_ID "orderId",
+        RC3.CARRIER_NAME "carrierName",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_CARRIER RC3
+        ON RC3.CARRIER_ID = ADSO.CARRIER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.RECEIVE_ID
+        LEFT JOIN RMS_CAPACITY RC
+        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=RRP.ADDRESS_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+        ON OO.PRICE_ID=ACTP.PRICE_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID=ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+
+        <where>
+            <if test="orderStatus!=null">
+                AND OO.ORDER_STATUS = #{orderStatus}
+            </if>
+
+            <if test="saleOrderId!=null">
+                AND ASO.SALE_ORDER_ID = #{saleOrderId}
             </if>
+
+            <if test="numberPlate!=null">
+                AND RC.CAPACITY_NUMBER LIKE #{numberPlate}
+            </if>
+
         </where>
         ) RRC
         <if test="con != null">