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
d1c6b6b7
Commit
d1c6b6b7
authored
Dec 11, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
d6059745
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
0 deletions
+23
-0
UsableVeicleDTO.java
.../java/com/xxfc/platform/vehicle/pojo/UsableVeicleDTO.java
+6
-0
VehicleMapper.xml
...ehicle-server/src/main/resources/mapper/VehicleMapper.xml
+17
-0
No files found.
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/UsableVeicleDTO.java
View file @
d1c6b6b7
...
@@ -74,4 +74,10 @@ public class UsableVeicleDTO extends PageParam {
...
@@ -74,4 +74,10 @@ public class UsableVeicleDTO extends PageParam {
this
.
endDate
=
DEFAULT_DATE_TIME_FORMATTER
.
format
(
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
endDateTamp
),
ZoneOffset
.
ofHours
(
8
)));
this
.
endDate
=
DEFAULT_DATE_TIME_FORMATTER
.
format
(
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
endDateTamp
),
ZoneOffset
.
ofHours
(
8
)));
this
.
endDateExtend
=
DEFAULT_DATE_TIME_FORMATTER
.
format
(
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
endDateTamp
),
ZoneOffset
.
ofHours
(
8
)).
plusDays
(
1L
));
this
.
endDateExtend
=
DEFAULT_DATE_TIME_FORMATTER
.
format
(
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
endDateTamp
),
ZoneOffset
.
ofHours
(
8
)).
plusDays
(
1L
));
}
}
private
Boolean
isTest
;
private
Integer
testCompanyId
;
private
Integer
testModelId
;
}
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @
d1c6b6b7
...
@@ -818,6 +818,23 @@
...
@@ -818,6 +818,23 @@
<select
id=
"searchUsableModel"
parameterType=
"java.util.Map"
<select
id=
"searchUsableModel"
parameterType=
"java.util.Map"
resultMap=
"searchUsableModelMap"
>
resultMap=
"searchUsableModelMap"
>
<if
test=
"isTest != null"
>
(select #{testModelId} as model_id, #{testCompanyId} as company_id
<if
test=
" catas != null "
>
,null as catas
</if>
<if
test=
" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true"
>
,0 as hasVehicle
</if>
<if
test=
"lon != null and lat != null"
>
<!-- 处理距离 -->
,0 as distance
</if>
)
union
</if>
(select distinct vm.id as model_id, bc.id as company_id
(select distinct vm.id as model_id, bc.id as company_id
<if
test=
" catas != null "
>
<if
test=
" catas != null "
>
,GROUP_CONCAT(vc.cata_id) as catas
,GROUP_CONCAT(vc.cata_id) as catas
...
...
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