Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
bf696e68
Commit
bf696e68
authored
Jul 25, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
蓬溪问题处理
parent
5dbaf3b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
12 deletions
+9
-12
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/AttendSummaryService.java
...s/xhx/daemon/applicationservice/AttendSummaryService.java
+1
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
...le/attendance/service/impl/AttendanceStatServiceImpl.java
+8
-12
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/AttendSummaryService.java
View file @
bf696e68
...
...
@@ -41,6 +41,7 @@ public class AttendSummaryService implements IApplicationStartedService {
try
{
AttendanceSummaryQuery
query
=
cacheService
.
brpop
(
KEY_ATTENDANCE_STAT_CACHE
,
60
,
AttendanceSummaryQuery
.
class
);
if
(!
ObjectUtils
.
isEmpty
(
query
)){
Thread
.
sleep
(
2000
);
if
(
StringUtils
.
isNotEmpty
(
query
.
getSummaryTimeStart
())
&&
StringUtils
.
isNotEmpty
(
query
.
getSummaryTimeEnd
()))
{
List
<
String
>
dateList
=
getDatesBetween
(
query
.
getSummaryTimeStart
(),
query
.
getSummaryTimeEnd
());
for
(
String
day
:
dateList
)
{
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
View file @
bf696e68
...
...
@@ -338,12 +338,10 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
if
(
staffStatTemp
!=
null
)
{
staffStat
.
setId
(
staffStatTemp
.
getId
());
staffStat
.
setUpdateTime
(
new
Date
());
log
.
info
(
JSON
.
toJSONString
(
staffStat
));
updateStaffStat
.
add
(
staffStat
);
}
else
{
staffStat
.
setCreateTime
(
DateUtils
.
StrToDate
(
query
.
getSummaryTime
()));
staffStat
.
setCreateUserId
(
1
l
);
log
.
info
(
JSON
.
toJSONString
(
staffStat
));
addStaffStat
.
add
(
staffStat
);
}
}
...
...
@@ -354,12 +352,10 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
this
.
dao
.
updateBatch
(
updateList
);
}
if
(
addStaffStat
.
size
()>
0
){
int
u
=
attendanceStaffStatService
.
save
(
addStaffStat
);
log
.
info
(
"attendanceStaffStatService新增数据:"
+
u
);
attendanceStaffStatService
.
save
(
addStaffStat
);
}
if
(
updateStaffStat
.
size
()>
0
){
int
u
=
attendanceStaffStatService
.
update
(
updateStaffStat
);
log
.
info
(
"attendanceStaffStatService更新数据:"
+
u
);
attendanceStaffStatService
.
update
(
updateStaffStat
);
}
}
log
.
info
(
"完成汇总当前日期假期余额....."
);
...
...
@@ -450,13 +446,13 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
staffStat
.
setId
(
staffStatTemp
.
getId
());
staffStat
.
setUpdateTime
(
new
Date
());
//attendanceStaffStatService.update(staffStat);
log
.
info
(
JSON
.
toJSONString
(
staffStat
));
//
log.info(JSON.toJSONString(staffStat));
updateStaffStat
.
add
(
staffStat
);
}
else
{
staffStat
.
setCreateTime
(
DateUtils
.
StrToDate
(
query
.
getSummaryTime
()));
staffStat
.
setCreateUserId
(
1
l
);
//attendanceStaffStatService.save(staffStat);
log
.
info
(
JSON
.
toJSONString
(
staffStat
));
//
log.info(JSON.toJSONString(staffStat));
addStaffStat
.
add
(
staffStat
);
}
}
...
...
@@ -464,12 +460,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
this
.
dao
.
updateBatch
(
updateList
);
}
if
(
addStaffStat
.
size
()>
0
){
int
u
=
a
ttendanceStaffStatService
.
save
(
addStaffStat
);
log
.
info
(
"attendanceStaffStatService新增数据:"
+
u
);
ttendanceStaffStatService
.
save
(
addStaffStat
);
//
log.info("attendanceStaffStatService新增数据:"+u);
}
if
(
updateStaffStat
.
size
()>
0
){
int
u
=
a
ttendanceStaffStatService
.
update
(
updateStaffStat
);
log
.
info
(
"attendanceStaffStatService更新数据:"
+
u
);
ttendanceStaffStatService
.
update
(
updateStaffStat
);
//
log.info("attendanceStaffStatService更新数据:"+u);
}
}
log
.
info
(
"完成汇总当前日期异常考勤....."
);
...
...
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