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
663bcd45
Commit
663bcd45
authored
11 months ago
by
赵啸非
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
165815b3
90520d01
master
dazhou
pengxi20240725
qionglai
reg
reg-first
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
0 deletions
+22
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/ErrorSummaryVo.java
...ortals/xhx/module/attendance/model/vo/ErrorSummaryVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/LeaveSummaryVo.java
...ortals/xhx/module/attendance/model/vo/LeaveSummaryVo.java
+4
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/VacationBalanceSummaryVo.java
.../module/attendance/model/vo/VacationBalanceSummaryVo.java
+5
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
...le/attendance/service/impl/AttendanceStatServiceImpl.java
+5
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
...rtals/xhx/module/staff/service/impl/StaffServiceImpl.java
+1
-0
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceSummaryMapper.xml
...rces/sqlmap/module/attendance/AttendanceSummaryMapper.xml
+3
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/ErrorSummaryVo.java
View file @
663bcd45
...
...
@@ -57,4 +57,8 @@ public class ErrorSummaryVo {
/** 异常次数 **/
private
Integer
errorCount
;
/**
* 入职时间
*/
private
Date
entryDate
;
}
This diff is collapsed.
Click to expand it.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/LeaveSummaryVo.java
View file @
663bcd45
...
...
@@ -54,4 +54,8 @@ public class LeaveSummaryVo {
* 离职时间
*/
private
Date
leaveDate
;
/**
* 入职时间
*/
private
Date
entryDate
;
}
This diff is collapsed.
Click to expand it.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/VacationBalanceSummaryVo.java
View file @
663bcd45
package
com.mortals.xhx.module.attendance.model.vo
;
import
com.mortals.framework.annotation.Excel
;
import
lombok.Data
;
import
java.math.BigDecimal
;
...
...
@@ -138,6 +139,10 @@ public class VacationBalanceSummaryVo {
* 离职时间
*/
private
Date
leaveDate
;
/**
* 入职时间
*/
private
Date
entryDate
;
/**
* 所属大厅
*/
...
...
This diff is collapsed.
Click to expand it.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
View file @
663bcd45
...
...
@@ -245,6 +245,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
List
<
AttendanceStaffStatEntity
>
addStaffStat
=
new
ArrayList
<>();
List
<
AttendanceStaffStatEntity
>
updateStaffStat
=
new
ArrayList
<>();
for
(
VacationBalanceSummaryVo
item
:
vacationBalanceSummaryVoList
)
{
String
entryDateStr
=
DateUtils
.
getStrDate
(
item
.
getEntryDate
());
if
(
DateUtils
.
StrToDate
(
query
.
getSummaryTime
()).
compareTo
(
DateUtils
.
StrToDate
(
entryDateStr
))
<
0
){
//统计日期在入职日期之前不统计
continue
;
}
if
(
item
.
getStatus
()
==
StaffSatusEnum
.
离职
.
getValue
()){
//离职状态时判断当前汇总日期是否在离职后
if
(
item
.
getLeaveDate
()!=
null
){
...
...
This diff is collapsed.
Click to expand it.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java
View file @
663bcd45
...
...
@@ -296,6 +296,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
staffLeaveEntity
.
setJobName
(
staff
.
getPositionName
());
staffLeaveEntity
.
setStaffType
(
staff
.
getStaffType
());
staffLeaveEntity
.
setStatus
(
StaffSatusEnum
.
离职
.
getValue
());
staffLeaveEntity
.
setEntryDate
(
staff
.
getCreateTime
());
staffLeaveEntity
.
setLeaveDate
(
new
Date
());
staffLeaveEntity
.
setLeaveReason
(
""
);
staffLeaveEntity
.
setAuditStatus
(
AuditStatusEnum
.
通过
.
getValue
());
...
...
This diff is collapsed.
Click to expand it.
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceSummaryMapper.xml
View file @
663bcd45
...
...
@@ -15,6 +15,7 @@
s.salaId,
s.salaName,
s.`status`,
s.createTime AS entryDate,
s.leaveDate,
DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%Y') as `year`,
DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%m') as `month`,
...
...
@@ -63,6 +64,7 @@
r.leavePersonId AS staffId,
r.leavePerson AS staffName,
ANY_VALUE(s.`status`) as `status`,
ANY_VALUE(s.createTime) AS entryDate,
ANY_VALUE(s.leaveDate) as leaveDate,
r.leaveType,
IFNULL(sum(r.duration),0) as duration,
...
...
@@ -89,6 +91,7 @@
e.staffId,
e.workNum,
ANY_VALUE(s.`status`) as `status`,
ANY_VALUE(s.createTime) AS entryDate,
ANY_VALUE(s.leaveDate) as leaveDate,
ANY_VALUE(DATE_FORMAT(errorDateTime,'%Y')) as `year`,
ANY_VALUE(DATE_FORMAT(errorDateTime,'%m')) as `month`,
...
...
This diff is collapsed.
Click to expand it.
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