Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
516891f7
Commit
516891f7
authored
Nov 04, 2022
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
05e94e43
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
DutyCommonServiceImpl.java
...module/common/biz/service/impl/DutyCommonServiceImpl.java
+12
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java
View file @
516891f7
...
...
@@ -529,8 +529,19 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
Map
<
Date
,
Long
>
dutyPersonShiftMap
=
dutyPersonShiftsDb
.
stream
()
.
collect
(
Collectors
.
toMap
(
DutyPersonShift:
:
getDutyDate
,
DutyPersonShift:
:
getSequenceNbr
));
// todo: 只更新当天及值班之后数据
// 修复导入当天值班数据bug
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
String
format
=
simpleDateFormat
.
format
(
new
Date
());
Date
date
=
null
;
try
{
date
=
simpleDateFormat
.
parse
(
format
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
Date
finalDate
=
date
;
Set
<
DutyPersonShift
>
needToDb
=
shiftDtos
.
stream
()
.
filter
(
s
->
DateUtils
.
dateCompare
(
s
.
getDutyDate
(),
new
Date
()
)
>=
0
).
map
(
shiftDto
->
{
.
filter
(
s
->
DateUtils
.
dateCompare
(
s
.
getDutyDate
(),
finalDate
)
>=
0
).
map
(
shiftDto
->
{
DutyPersonShift
dutyPersonShift
=
new
DutyPersonShift
();
Bean
.
copyExistPropertis
(
shiftDto
,
dutyPersonShift
);
dutyPersonShift
.
setInstanceId
(
finalInstanceId
);
...
...
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