Skip to content

J
jiedao-api-boot-master
Commit b027cb4e authored by honghy's avatar honghy
Browse files
Options

bug201 【(app/h5)首页/我的订单各个tab】

parent 51d91905
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java
View file @ b027cb4e
...@@ -1660,7 +1660,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -1660,7 +1660,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
"))", "))",
"</when>", "</when>",
"<when test = 'query.searchKey != null and query.searchKey != \"\" '>", "<when test = 'query.searchKey != null and query.searchKey != \"\" '>",
"AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like concat('%',concat(#{query.searchKey},'%'))", "AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like concat('%',concat(#{query.searchKey},'%'))",
"</when>", "</when>",
"<when test = 'query.marks != null and query.marks != \"\" '>", "<when test = 'query.marks != null and query.marks != \"\" '>",
"AND o.`marks` like concat('%',concat(#{query.marks},'%'))", "AND o.`marks` like concat('%',concat(#{query.marks},'%'))",
...@@ -2409,7 +2409,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -2409,7 +2409,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
"<foreach item='customerContactsId' index='index' collection='query.consigneeContactsIds' open='(' separator=',' close=')'>#{customerContactsId}</foreach>", "<foreach item='customerContactsId' index='index' collection='query.consigneeContactsIds' open='(' separator=',' close=')'>#{customerContactsId}</foreach>",
"</if>)", "</if>)",
"<when test = 'query.searchKey != null and query.searchKey != \"\" '>", "<when test = 'query.searchKey != null and query.searchKey != \"\" '>",
"AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like concat('%',concat(#{query.searchKey},'%'))", "AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like concat('%',concat(#{query.searchKey},'%'))",
"</when>", "</when>",
"<when test = 'query.orderNo != null and query.orderNo != \"\" '>", "<when test = 'query.orderNo != null and query.orderNo != \"\" '>",
"AND o.`order_no` like concat('%',concat(#{query.orderNo},'%'))", "AND o.`order_no` like concat('%',concat(#{query.orderNo},'%'))",
......
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ b027cb4e
...@@ -4233,7 +4233,7 @@ ...@@ -4233,7 +4233,7 @@
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like
concat("%",concat(#{query.searchKey},"%")) concat("%",concat(#{query.searchKey},"%"))
</if> </if>
<if test="query.consignorKey != null and query.consignorKey != '' "> <if test="query.consignorKey != null and query.consignorKey != '' ">
...@@ -5825,7 +5825,7 @@ ...@@ -5825,7 +5825,7 @@
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like
concat("%",concat(#{query.searchKey},"%")) concat("%",concat(#{query.searchKey},"%"))
</if> </if>
<if test="query.consignorKey != null and query.consignorKey != '' "> <if test="query.consignorKey != null and query.consignorKey != '' ">
...@@ -6452,7 +6452,7 @@ ...@@ -6452,7 +6452,7 @@
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like
concat("%",concat(#{query.searchKey},"%")) concat("%",concat(#{query.searchKey},"%"))
</if> </if>
<if test="query.type != null and query.type != '' and query.type == 0 "> <if test="query.type != null and query.type != '' and query.type == 0 ">
...@@ -6931,7 +6931,7 @@ ...@@ -6931,7 +6931,7 @@
</if> </if>
<if test="query.searchKey != null and query.searchKey != '' "> <if test="query.searchKey != null and query.searchKey != '' ">
AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'') AND concat(IFNULL(o.`order_no`,''), IFNULL(o.`old_numbers`,'')
,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,'')) like ,IFNULL(o.`marks`,''),IFNULL(o.`tidan_no`,''),IFNULL(o.`container_number`,''),IFNULL(nee.`name`,''),IFNULL(nee.`phone`,''),IFNULL(nor.`phone`,'')) like
concat("%",concat(#{query.searchKey},"%")) concat("%",concat(#{query.searchKey},"%"))
</if> </if>
<if test="query.type != null and query.type != '' and query.type == 0 "> <if test="query.type != null and query.type != '' and query.type == 0 ">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment