Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
0383d6c0
Commit
0383d6c0
authored
Aug 10, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
c166f5e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
VehicleMapper.xml
...ehicle-server/src/main/resources/mapper/VehicleMapper.xml
+3
-3
No files found.
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @
0383d6c0
...
@@ -544,7 +544,7 @@
...
@@ -544,7 +544,7 @@
<!-- union 所有车型 -->
<!-- union 所有车型 -->
<if
test=
"startCompanyId != null or parkBranchCompanyId != null "
>
<if
test=
"startCompanyId != null or parkBranchCompanyId != null "
>
union
union
(select id as model_id, bc.id as company_id
(select
vm.
id as model_id, bc.id as company_id
<if
test=
" catas != null "
>
<if
test=
" catas != null "
>
,null as catas
,null as catas
</if>
</if>
...
@@ -555,7 +555,7 @@
...
@@ -555,7 +555,7 @@
<!-- 处理距离 -->
<!-- 处理距离 -->
,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
</if>
</if>
from vehicle_model
from vehicle_model
vm
left join branch_company bc on
left join branch_company bc on
<choose>
<choose>
<when
test=
"startCompanyId != null"
>
<when
test=
"startCompanyId != null"
>
...
@@ -565,7 +565,7 @@
...
@@ -565,7 +565,7 @@
bc.id = #{parkBranchCompanyId}
bc.id = #{parkBranchCompanyId}
</otherwise>
</otherwise>
</choose>
</choose>
where v
ehicle_model
.isdel = 0)
where v
m
.isdel = 0)
</if>
</if>
<if
test=
"lon != null and lat != null"
>
<if
test=
"lon != null and lat != null"
>
order by
order by
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment