Skip to content

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

sql修复

parent 1edc3b18
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ 5457e14c
...@@ -1222,7 +1222,7 @@ ...@@ -1222,7 +1222,7 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -1231,7 +1231,7 @@ ...@@ -1231,7 +1231,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
...@@ -1364,7 +1364,7 @@ ...@@ -1364,7 +1364,7 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -1373,7 +1373,7 @@ ...@@ -1373,7 +1373,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
...@@ -3707,7 +3707,7 @@ ...@@ -3707,7 +3707,7 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -3716,7 +3716,7 @@ ...@@ -3716,7 +3716,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
...@@ -3831,7 +3831,7 @@ ...@@ -3831,7 +3831,7 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -3840,7 +3840,7 @@ ...@@ -3840,7 +3840,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
...@@ -3981,7 +3981,7 @@ ...@@ -3981,7 +3981,7 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -3990,7 +3990,7 @@ ...@@ -3990,7 +3990,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
...@@ -4117,7 +4117,7 @@ ...@@ -4117,7 +4117,7 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -4126,7 +4126,7 @@ ...@@ -4126,7 +4126,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
...@@ -4222,7 +4222,7 @@ ...@@ -4222,7 +4222,7 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -4231,7 +4231,7 @@ ...@@ -4231,7 +4231,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
...@@ -4340,7 +4340,7 @@ ...@@ -4340,7 +4340,7 @@
o.is_exception, o.is_exception,
o.create_time, o.create_time,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -4349,7 +4349,7 @@ ...@@ -4349,7 +4349,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
...@@ -5328,7 +5328,7 @@ ...@@ -5328,7 +5328,7 @@
o.create_time, o.create_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -5337,7 +5337,7 @@ ...@@ -5337,7 +5337,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
...@@ -5427,7 +5427,7 @@ ...@@ -5427,7 +5427,7 @@
o.create_time, o.create_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L, if(nor.customer_id != null and nor.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService, "") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
...@@ -5436,7 +5436,7 @@ ...@@ -5436,7 +5436,7 @@
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L, if(nee.customer_id != null and nee.customer_id > 0,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id), (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService, "") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
......
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