Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
b2f565e3
Commit
b2f565e3
authored
Oct 12, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BUGFIX] fixed dateutil get period start and end
parent
2d52fc08
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
DateUtils.java
...src/main/java/pwc/taxtech/atms/common/util/DateUtils.java
+6
-4
No files found.
atms-api/src/main/java/pwc/taxtech/atms/common/util/DateUtils.java
View file @
b2f565e3
...
...
@@ -534,17 +534,19 @@ public class DateUtils {
}
public
static
String
getPeriodBegin
(
int
year
,
int
period
)
{
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd
hh
:mm:ss"
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd
HH
:mm:ss"
);
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
set
(
year
,
period
-
1
,
1
,
0
,
0
,
0
);
return
sdf
.
format
(
calendar
.
getTime
());
}
public
static
String
getPeriodEnd
(
int
year
,
int
period
)
{
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd
hh
:mm:ss"
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd
HH
:mm:ss"
);
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
set
(
year
,
period
-
1
,
-
1
,
23
,
59
,
59
);
if
(
period
<
12
)
calendar
.
set
(
year
,
period
,
-
1
,
23
,
59
,
59
);
else
if
(
period
==
12
)
calendar
.
set
(
year
,
period
-
1
,
31
,
23
,
59
,
59
);
return
sdf
.
format
(
calendar
.
getTime
());
}
...
...
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