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

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

@@ -252,8 +252,8 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
             mapValue=new HashMap<>();
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
-        if (con!=null&&!con.equals("undifined")&&!con.equals("")){
-            mapValue.put("con","%" + con + "%");
+        if (con!=null){
+            mapValue.put("con",con);
         }
         if (userId!=null&&!userId.equals("undifined")&&!userId.equals("")){
             mapValue.put("userId",userId);

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

@@ -786,9 +786,8 @@
     <if test="orderType!=null">
       AND OO.ORDER_TYPE in (#{orderType},11)
     </if>
-    <if test="con!=null">
-      AND RC.CAPACITY_NUMBER LIKE #{con} or RM.MATERIAL_NAME LIKE #{con}
-      or RS.SHIPPER_NAME LIKE #{con}
+    <if test="con!=null and con != ''">
+      AND RC.CAPACITY_NUMBER || RM.MATERIAL_NAME ||  RS.SHIPPER_NAME LIKE CONCAT('%',CONCAT(#{con},'%'))
     </if>
     <if test="userId!=null">
       AND  instr(AIR.INSERT_USERNAME,#{userId}) > 0