Merge branch 'refs/heads/add_address_query_20240712' into test

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -122,8 +122,8 @@ public class OrderChildSqlProvider {
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (StringUtils.isNotBlank(param.getDriverName())) {WHERE("driver_name= #{param.driverName}");}
             if (StringUtils.isNotBlank(param.getDriverMobile())) {WHERE("driver_mobile = #{param.driverMobile}");}
-            if(StringUtils.isNotBlank(param.getSendAddress())){WHERE("send_address like CONCAT('%',#{param.sendAddress}) ");}
-            if(StringUtils.isNotBlank(param.getReceiveAddress())){WHERE("reveive_address like CONCAT('%',#{param.receiveAddress}) ");}
+            if(StringUtils.isNotBlank(param.getSendAddress())){WHERE("send_address like CONCAT('%',#{param.sendAddress},'%') ");}
+            if(StringUtils.isNotBlank(param.getReceiveAddress())){WHERE("reveive_address like CONCAT('%',#{param.receiveAddress},'%') ");}
             if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
             if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like '%"+ param.getTruckNo() +"%'");}
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -82,8 +82,8 @@ public class OrderGoodsSqlProvider {
             if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {
                 WHERE("a.order_goods_no = #{param.orderGoodsNo}");
             }
-            if(StringUtils.isNotBlank(param.getSendAddress())){WHERE("a.send_address_shorter like CONCAT('%',#{param.sendAddress}) ");}
-            if(StringUtils.isNotBlank(param.getReceiveAddress())){WHERE("a.receive_address_shorter like CONCAT('%',#{param.receiveAddress}) ");}
+            if(StringUtils.isNotBlank(param.getSendAddress())){WHERE("a.send_address_shorter like CONCAT('%',#{param.sendAddress},'%') ");}
+            if(StringUtils.isNotBlank(param.getReceiveAddress())){WHERE("a.receive_address_shorter like CONCAT('%',#{param.receiveAddress},'%') ");}
             ORDER_BY("a.create_time desc");
         }}.toString();
         return sql;