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
1ba321ba
Commit
1ba321ba
authored
Dec 02, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-vehicle-count-bug' into dev
parents
f005f688
a131aca8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
BranchCompanyVehicleCountBiz.java
...fc/platform/vehicle/biz/BranchCompanyVehicleCountBiz.java
+2
-2
No files found.
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyVehicleCountBiz.java
View file @
1ba321ba
...
@@ -95,8 +95,8 @@ public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCo
...
@@ -95,8 +95,8 @@ public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCo
branchCompanyVehicleCountDTO
.
setPage
(
page
);
branchCompanyVehicleCountDTO
.
setPage
(
page
);
branchCompanyVehicleCountDTO
.
setLimit
(
limit
);
branchCompanyVehicleCountDTO
.
setLimit
(
limit
);
if
(
StringUtils
.
isBlank
(
branchCompanyVehicleCountDTO
.
getStartTime
())
||
StringUtils
.
isBlank
(
branchCompanyVehicleCountDTO
.
getEndTime
()))
{
if
(
StringUtils
.
isBlank
(
branchCompanyVehicleCountDTO
.
getStartTime
())
||
StringUtils
.
isBlank
(
branchCompanyVehicleCountDTO
.
getEndTime
()))
{
branchCompanyVehicleCountDTO
.
setStartTime
(
DateTime
.
now
().
toString
(
DATE_TIME_FORMATTER
));
branchCompanyVehicleCountDTO
.
setStartTime
(
DateTime
.
now
().
minusDays
(
1
).
toString
(
DATE_TIME_FORMATTER
));
branchCompanyVehicleCountDTO
.
setEndTime
(
DateTime
.
now
().
toString
(
DATE_TIME_FORMATTER
));
branchCompanyVehicleCountDTO
.
setEndTime
(
DateTime
.
now
().
minusDays
(
1
).
toString
(
DATE_TIME_FORMATTER
));
}
}
Query
query
=
new
Query
(
branchCompanyVehicleCountDTO
);
Query
query
=
new
Query
(
branchCompanyVehicleCountDTO
);
if
(
type
==
1
)
{
//按天
if
(
type
==
1
)
{
//按天
...
...
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