Skip to content

C
cloud-platform
Commit 394774ad authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master-background-manager' into base-modify

parents b3c057d2 af0864ad
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 36 deletions
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @ 394774ad
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
SELECT r.* FROM ( SELECT r.* FROM (
select DISTINCT v.`id`, select DISTINCT v.`id`,
v.`code`, v.`code`,
v.`status`, (CASE WHEN #{status} != null THEN #{status}
ELSE 0 END) status ,
v.number_plate, v.number_plate,
v.brand, v.brand,
v.park_branch_company_id, v.park_branch_company_id,
...@@ -118,9 +119,9 @@ ...@@ -118,9 +119,9 @@
<if test="vin !=null and vin != ''"> <if test="vin !=null and vin != ''">
and v.vin = #{vin} and v.vin = #{vin}
</if> </if>
<!-- <if test="subordinateBranch !=null">--> <!-- <if test="subordinateBranch !=null">-->
<!-- and v.subordinate_branch = #{subordinateBranch}--> <!-- and v.subordinate_branch = #{subordinateBranch}-->
<!-- </if>--> <!-- </if>-->
<if test="code !=null"> <if test="code !=null">
and v.code = #{code} and v.code = #{code}
</if> </if>
...@@ -178,7 +179,8 @@ ...@@ -178,7 +179,8 @@
SELECT r.* FROM ( SELECT r.* FROM (
select DISTINCT v.`id`, select DISTINCT v.`id`,
v.`code`, v.`code`,
v.`status`, (CASE WHEN #{status} != null THEN #{status}
ELSE 0 END) status ,
v.number_plate, v.number_plate,
v.brand, v.brand,
-- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch, -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
...@@ -280,9 +282,9 @@ ...@@ -280,9 +282,9 @@
<if test="vin !=null and vin != ''"> <if test="vin !=null and vin != ''">
and v.vin = #{vin} and v.vin = #{vin}
</if> </if>
<!-- <if test="subordinateBranch !=null">--> <!-- <if test="subordinateBranch !=null">-->
<!-- and v.subordinate_branch = #{subordinateBranch}--> <!-- and v.subordinate_branch = #{subordinateBranch}-->
<!-- </if>--> <!-- </if>-->
<if test="code !=null"> <if test="code !=null">
and v.code = #{code} and v.code = #{code}
</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