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
abb3f7cf
Commit
abb3f7cf
authored
Oct 08, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改考勤汇总情况描述
parent
0b5188d1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
...le/attendance/service/impl/AttendanceStatServiceImpl.java
+6
-2
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
View file @
abb3f7cf
...
@@ -432,7 +432,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
...
@@ -432,7 +432,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
staffStat
.
initAttrValue
();
staffStat
.
initAttrValue
();
BeanUtils
.
copyProperties
(
item
,
staffStat
,
BeanUtil
.
getNullPropertyNames
(
item
));
BeanUtils
.
copyProperties
(
item
,
staffStat
,
BeanUtil
.
getNullPropertyNames
(
item
));
if
(
normal
>
0
){
if
(
normal
>
0
){
attendanceSummary
=
"正常*"
+
normal
+
"次;"
+
attendanceSummary
;
attendanceSummary
=
"正常*"
+
normal
+
"次;"
+
attendanceSummary
;
}
}
staffStat
.
setAttendanceSummary
(
attendanceSummary
);
staffStat
.
setAttendanceSummary
(
attendanceSummary
);
...
@@ -634,7 +634,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
...
@@ -634,7 +634,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
if
(
staffStatTemp
!=
null
)
{
if
(
staffStatTemp
!=
null
)
{
staffStat
.
setId
(
staffStatTemp
.
getId
());
staffStat
.
setId
(
staffStatTemp
.
getId
());
staffStat
.
setUpdateTime
(
new
Date
());
staffStat
.
setUpdateTime
(
new
Date
());
if
(
staffStatTemp
.
getAttendanceSummary
().
equals
(
"正常"
)){
staffStat
.
setAttendanceSummary
(
attendanceSummary
);
}
else
{
staffStat
.
setAttendanceSummary
(
staffStatTemp
.
getAttendanceSummary
()
+
attendanceSummary
);
staffStat
.
setAttendanceSummary
(
staffStatTemp
.
getAttendanceSummary
()
+
attendanceSummary
);
}
updateStaffStat
.
add
(
staffStat
);
updateStaffStat
.
add
(
staffStat
);
}
else
{
}
else
{
staffStat
.
setCreateTime
(
DateUtils
.
StrToDate
(
query
.
getSummaryTime
()));
staffStat
.
setCreateTime
(
DateUtils
.
StrToDate
(
query
.
getSummaryTime
()));
...
...
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