快递搜索bug

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceExpressSearchAdminParam.java

@@ -22,6 +22,7 @@ public class PerformanceExpressSearchAdminParam {
     private String orderStatus;
 
     private String userMobile;
+    private String userName;
     private String expressStatus;
 
     private String expressContacts;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -5,7 +5,6 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.PerformancesExpressServiceImpl;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.OrderExpressListDao;
 import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceListAdminDao;
 import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdminDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceExpressSearchAdminParam;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html

@@ -29,11 +29,11 @@
                         </li>
                         <li>
                             <label>收货人电话：</label>
-                            <input type="text" name="expressContacts"/>
+                            <input type="text" name="expressPhone"/>
                         </li>
                         <li>
                             <label>收货人姓名：</label>
-                            <input type="text" name="expressPhone"/>
+                            <input type="text" name="expressContacts"/>
                         </li>
                         <li>
                             <label>订单状态：</label>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -302,10 +302,10 @@
             <if test="orderStatus!=null and orderStatus!=''">AND kots.status = #{orderStatus}</if>
 
             <if test="userMobile != null  and userMobile != ''">AND kot.user_mobile = #{userMobile}</if>
-            <if test="userName != null  and userName != ''">AND kot.user_name like concat('%', #{userName}, '%')</if>
+            <if test="userName != null  and userName != ''">AND kot.user_name LIKE concat('%', #{userName}, '%')</if>
 
-            <if test="expressContacts != null  and expressContacts != ''">AND kot.express_contacts = like concat('%', #{expressContacts}, '%')</if>
             <if test="expressPhone != null  and expressPhone != ''">AND kot.express_phone = #{expressPhone}</if>
+            <if test="expressContacts != null  and expressContacts != ''">AND kot.express_contacts LIKE concat('%', #{expressContacts}, '%')</if>
         </where>
     </select>
     <select id="getCanPlaceOrderList" resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets">