'表头bug'

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/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -1645,7 +1645,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",
@@ -1670,8 +1670,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>
         )
@@ -1694,28 +1694,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">