Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
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
haoban3.0
haoban-manage3.0
Commits
dc235eb9
Commit
dc235eb9
authored
Jan 16, 2024
by
songyinghui
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-wm-data' into 'master'
feature: 结束时间兼容 See merge request
!1626
parents
0408071c
013072b3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
MaterialStatisticsBaseQO.java
...e/web/qo/content/statistics/MaterialStatisticsBaseQO.java
+1
-1
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/statistics/MaterialStatisticsBaseQO.java
View file @
dc235eb9
...
@@ -94,7 +94,7 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
...
@@ -94,7 +94,7 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
public
String
getEndDate
()
{
public
String
getEndDate
()
{
if
(
StringUtils
.
isBlank
(
this
.
endDate
))
{
if
(
StringUtils
.
isBlank
(
this
.
endDate
))
{
return
DateUtil
.
dateToStr
(
new
Date
(
),
"yyyy-MM-dd"
);
return
DateUtil
.
dateToStr
(
DateUtils
.
addDays
(
new
Date
(),
-
1
),
"yyyy-MM-dd"
);
}
}
return
endDate
;
return
endDate
;
}
}
...
...
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