Skip to content

J
jiedao-api-boot-master
Commit 90e0becc authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'release-fix' into dev

parents 44e8abeb e641a573
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 20 deletions
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ 90e0becc
...@@ -725,13 +725,13 @@ ...@@ -725,13 +725,13 @@
<if test="query.salesmanIds != null and query.salesmanIds.size()==1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()==1 ">
AND (o.`salesman_id` = AND (o.`salesman_id` =
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
cus.customer_service = cus.customer_service =
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
)) ))
...@@ -739,13 +739,13 @@ ...@@ -739,13 +739,13 @@
<if test="query.salesmanIds != null and query.salesmanIds.size()>1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()>1 ">
AND (o.`salesman_id` in AND (o.`salesman_id` in
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
cus.customer_service in cus.customer_service in
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
) )
...@@ -1727,13 +1727,13 @@ ...@@ -1727,13 +1727,13 @@
<if test="query.salesmanIds != null and query.salesmanIds.size()==1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()==1 ">
AND (o.`salesman_id` = AND (o.`salesman_id` =
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
cus.customer_service = cus.customer_service =
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
)) ))
...@@ -1741,13 +1741,13 @@ ...@@ -1741,13 +1741,13 @@
<if test="query.salesmanIds != null and query.salesmanIds.size()>1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()>1 ">
AND (o.`salesman_id` in AND (o.`salesman_id` in
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
cus.customer_service in cus.customer_service in
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
) )
...@@ -2481,13 +2481,13 @@ ...@@ -2481,13 +2481,13 @@
<if test="query.salesmanIds != null and query.salesmanIds.size()==1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()==1 ">
AND (o.`salesman_id` = AND (o.`salesman_id` =
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
cus.customer_service = cus.customer_service =
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
)) ))
...@@ -2495,13 +2495,13 @@ ...@@ -2495,13 +2495,13 @@
<if test="query.salesmanIds != null and query.salesmanIds.size()>1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()>1 ">
AND (o.`salesman_id` in AND (o.`salesman_id` in
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
cus.customer_service in cus.customer_service in
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
) )
...@@ -3169,13 +3169,13 @@ ...@@ -3169,13 +3169,13 @@
<if test="query.salesmanIds != null and query.salesmanIds.size()==1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()==1 ">
AND (o.`salesman_id` = AND (o.`salesman_id` =
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
cus.customer_service = cus.customer_service =
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
)) ))
...@@ -3183,13 +3183,13 @@ ...@@ -3183,13 +3183,13 @@
<if test="query.salesmanIds != null and query.salesmanIds.size()>1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()>1 ">
AND (o.`salesman_id` in AND (o.`salesman_id` in
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
cus.customer_service in cus.customer_service in
<foreach item='salesmanId' index="index" collection='query.salesmanIds'> <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
) )
...@@ -3931,6 +3931,7 @@ ...@@ -3931,6 +3931,7 @@
o.unload_time, o.unload_time,
o.is_limit_update_consignee, o.is_limit_update_consignee,
o.lock_consignee_time, o.lock_consignee_time,
o.lock_consignee_day,
(select su.nickname from system_user su where su.deleted = 0 and su.id = o.salesman_id) as salesman_name, (select su.nickname from system_user su where su.deleted = 0 and su.id = o.salesman_id) as salesman_name,
(select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as (select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
in_time, in_time,
...@@ -4315,24 +4316,24 @@ ...@@ -4315,24 +4316,24 @@
<if test="query.salesmanIds != null and query.salesmanIds.size()==1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()==1 ">
AND (o.`salesman_id` = AND (o.`salesman_id` =
<foreach item='salesmanId' index="index" collection='query.salesmanIds' > <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and cus.customer_service = o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and cus.customer_service =
<foreach item='salesmanId' index="index" collection='query.salesmanIds' > <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> )) </foreach> ))
</if> </if>
<if test="query.salesmanIds != null and query.salesmanIds.size()>1 "> <if test="query.salesmanIds != null and query.salesmanIds.size()>1 ">
AND (o.`salesman_id` in AND (o.`salesman_id` in
<foreach item='salesmanId' index="index" collection='query.salesmanIds' > <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> </foreach>
or or
o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and cus.customer_service in o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and cus.customer_service in
<foreach item='salesmanId' index="index" collection='query.salesmanIds' > <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
#{salesmanId} #{salesmanId}
</foreach> )) </foreach> ))
</if> </if>
......
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