Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -66,6 +66,9 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
         if (orderType!=null){
             mapValue.put("orderTypee", orderType);
         }
+        if(con !=null &&!"null".equals(con)){
+            mapValue.put("con","%" + con + "%");
+        }
         if (userId!=null){
             mapValue.put("userId",userId);
         }

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

@@ -336,6 +336,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("IsAssembly", false);
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
+
                 break;
             case 11:
                 //纯内转发送计量委托

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

@@ -254,6 +254,12 @@
                     "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
+            <if test="lineName != null">
+                and
+                <foreach collection="lineName" item="item" open="(" separator="or" close=")">
+                    "lineName" like '%${item}%'
+                </foreach>
+            </if>
             <if test="warehouseName != null">
                 and
                 <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">

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

@@ -868,6 +868,7 @@
         SELECT *
         FROM (
         SELECT TUR.RESULT_ID             "resultId",
+        OO.ORDER_NUMBER || RC.CAPACITY_NUMBER || RW.WAREHOUSE_NAME || RM.MATERIAL_NAME "mohu",
         OO.ORDER_NUMBER           "orderNumber",
         RC.CAPACITY_NUMBER        "capacityNumber",
         RM.MATERIAL_NAME          "materialName",
@@ -894,7 +895,11 @@
         ORDER BY TUR.RESULT_END_TIME desc
         )
         <where>
+            <if test="con !=null">
+                 "mohu" like #{con}
+            </if>
             <if test="orderNumber != null">
+                and
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
                     "orderNumber" like '%${item}%'
                 </foreach>