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
0a233d4d
Commit
0a233d4d
authored
Apr 07, 2025
by
周亚武
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加假期类型(上年公休结余)
parent
b3065992
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
.../module/attendance/model/AttendanceLeaveRecordEntity.java
+2
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
...dingding/personal/service/impl/DingPersonServiceImpl.java
+3
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
View file @
0a233d4d
...
...
@@ -44,9 +44,9 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
@Excel
(
name
=
"电话号码"
)
private
String
phoneNumber
;
/**
* 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假,22.其他)
* 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假,22.其他
,23=上年公休结余
)
*/
@Excel
(
name
=
"请假类型"
,
readConverterExp
=
"1=事假,2=调休,3=病假,4=年假,5=产假,6=陪产假,7=婚假,8=例假,9=哺乳假,10=丧假,11=回单位,12=因公请假,13=外出勘验,14=值班补班,15=体检,16=隔离,17=因公外出,18=公休,19=育儿假,20=调回单位,21=探亲假,22=其他"
)
@Excel
(
name
=
"请假类型"
,
readConverterExp
=
"1=事假,2=调休,3=病假,4=年假,5=产假,6=陪产假,7=婚假,8=例假,9=哺乳假,10=丧假,11=回单位,12=因公请假,13=外出勘验,14=值班补班,15=体检,16=隔离,17=因公外出,18=公休,19=育儿假,20=调回单位,21=探亲假,22=其他
,23=上年公休结余
"
)
private
Integer
leaveType
;
/**
* 开始时间
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
View file @
0a233d4d
...
...
@@ -525,6 +525,9 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
leaveRecordEntity
.
setLeaveType
(
21
);
leave_code
=
LeaveRulesEnum
.
探亲假
.
getLeave_code
();
break
;
case
"上年公休结余"
:
leaveRecordEntity
.
setLeaveType
(
23
);
break
;
default
:
leaveRecordEntity
.
setLeaveType
(
22
);
//默认其他
break
;
...
...
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