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
15896f65
Commit
15896f65
authored
Apr 20, 2023
by
songyinghui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 月报周期
parent
ab59fd66
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
MaterialReportBuilder.java
...ervice/service/content/adaptor/MaterialReportBuilder.java
+5
-2
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MaterialReportBuilder.java
View file @
15896f65
...
...
@@ -159,11 +159,14 @@ public class MaterialReportBuilder {
String
bizDate
=
null
;
if
(
MaterialReportType
.
WEEK
.
getCode
().
equals
(
reportType
))
{
// 周报
bizDate
=
DateUtil
.
beginOfWeek
(
DateUtil
.
lastWeek
()).
toString
(
"yyyy-MM-dd"
);
// bizDate = DateUtil.beginOfWeek(DateUtil.lastWeek()).toString("yyyy-MM-dd");
bizDate
=
DateUtil
.
beginOfWeek
(
new
Date
()).
toString
(
"yyyy-MM-dd"
);
}
else
{
// 月报
bizDate
=
DateUtil
.
beginOfMonth
(
DateUtil
.
lastMonth
()).
toString
(
"yyyy-MM"
);
// bizDate = DateUtil.beginOfMonth(DateUtil.lastMonth()).toString("yyyy-MM");
bizDate
=
DateUtil
.
beginOfMonth
(
new
Date
()).
toString
(
"yyyy-MM"
);
}
return
bizDate
;
}
...
...
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