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
ab109295
Commit
ab109295
authored
Jan 15, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
考勤汇总增加只汇总某个人的数据
parent
f71898b3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
0 deletions
+10
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/AttendSummaryService.java
...s/xhx/daemon/applicationservice/AttendSummaryService.java
+3
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
...le/attendance/service/impl/AttendanceStatServiceImpl.java
+6
-0
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceSummaryMapper.xml
...rces/sqlmap/module/attendance/AttendanceSummaryMapper.xml
+1
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/AttendSummaryService.java
View file @
ab109295
...
...
@@ -45,6 +45,9 @@ public class AttendSummaryService implements IApplicationStartedService {
List
<
String
>
dateList
=
getDatesBetween
(
query
.
getSummaryTimeStart
(),
query
.
getSummaryTimeEnd
());
for
(
String
day
:
dateList
)
{
AttendanceSummaryQuery
temp
=
new
AttendanceSummaryQuery
(
day
);
if
(
query
.
getStaffId
()!=
null
){
temp
.
setStaffId
(
query
.
getStaffId
());
}
attendanceStatService
.
doAttendanceSummary
(
temp
);
}
}
else
{
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
View file @
ab109295
...
...
@@ -229,11 +229,17 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
condition
.
put
(
"year"
,
y
);
condition
.
put
(
"month"
,
m
);
condition
.
put
(
"day"
,
d
);
if
(
query
.
getStaffId
()!=
null
){
condition
.
put
(
"staffId"
,
query
.
getStaffId
());
}
this
.
dao
.
delete
(
condition
);
AttendanceStaffStatEntity
staffStatDelete
=
new
AttendanceStaffStatEntity
();
staffStatDelete
.
setYear
(
y
);
staffStatDelete
.
setMonth
(
m
);
staffStatDelete
.
setDay
(
d
);
if
(
query
.
getStaffId
()!=
null
){
staffStatDelete
.
setStaffId
(
query
.
getStaffId
());
}
attendanceStaffStatService
.
remove
(
staffStatDelete
,
null
);
//汇总当前日期假期余额
List
<
VacationBalanceSummaryVo
>
vacationBalanceSummaryVoList
=
attendanceSummaryDao
.
getVacationBalanceSummary
(
query
);
...
...
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceSummaryMapper.xml
View file @
ab109295
...
...
@@ -54,6 +54,7 @@
<if
test=
"dayOfWeek != null and dayOfWeek == 6"
>
AND f.friday = 1
</if>
<if
test=
"dayOfWeek != null and dayOfWeek == 7"
>
AND f.saturday = 1
</if>
<if
test=
"dayOfWeek != null and dayOfWeek == 1"
>
AND f.sunday = 1
</if>
<if
test=
"staffId != null and staffId!=''"
>
AND s.id = #{staffId}
</if>
</select>
<!-- 汇总当前日期请假情况 -->
...
...
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