Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
b8a7fab0
Commit
b8a7fab0
authored
Nov 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-派单暂存
parent
14049543
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
9 deletions
+4
-9
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+1
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+2
-8
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
b8a7fab0
...
@@ -1335,6 +1335,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1335,6 +1335,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
leaveReason
=
baseSearchVO
.
getResultIdThree
();
leaveReason
=
baseSearchVO
.
getResultIdThree
();
vo
.
setLeaveDate
(
leaveDate
);
vo
.
setLeaveDate
(
leaveDate
);
vo
.
setReduceReason
(
leaveReason
);
vo
.
setReduceReason
(
leaveReason
);
vo
.
setChangeContractAndEmployee
(
CommonConstants
.
ONE_STRING
);
}
}
if
(
Common
.
isNotNull
(
leaveId
))
{
if
(
Common
.
isNotNull
(
leaveId
))
{
rowLeaveMap
.
put
(
i
,
leaveId
);
rowLeaveMap
.
put
(
i
,
leaveId
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
b8a7fab0
...
@@ -697,7 +697,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -697,7 +697,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
List
<
EmployeeLeaveVO
>
cachedDataList
=
new
ArrayList
<>();
List
<
EmployeeLeaveVO
>
cachedDataList
=
new
ArrayList
<>();
EmployeeLeaveVO
vo
;
EmployeeLeaveVO
vo
;
Map
<
Integer
,
String
>
rowLeaveMap
=
new
HashMap
<>();
Map
<
Integer
,
String
>
rowLeaveMap
=
new
HashMap
<>();
int
i
=
0
;
int
i
=
1
;
// 内部是i+2
for
(
BaseSearchVO
param
:
listParam
)
{
for
(
BaseSearchVO
param
:
listParam
)
{
i
++;
i
++;
vo
=
new
EmployeeLeaveVO
();
vo
=
new
EmployeeLeaveVO
();
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
b8a7fab0
...
@@ -1166,9 +1166,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1166,9 +1166,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
searchVo
.
setDeptNo
(
leave
.
getDeptNo
());
searchVo
.
setDeptNo
(
leave
.
getDeptNo
());
searchVo
.
setResultIdOne
(
leave
.
getId
());
searchVo
.
setResultIdOne
(
leave
.
getId
());
if
(
Common
.
isNotNull
(
leave
.
getLeaveReasonName
()))
{
if
(
Common
.
isNotNull
(
leave
.
getLeaveReasonName
()))
{
searchVo
.
setResultIdThree
(
leave
.
getLeaveReason
Name
());
searchVo
.
setResultIdThree
(
leave
.
getLeaveReason
Id
());
}
else
{
}
else
{
searchVo
.
setResultIdThree
(
RegistConstants
.
BASE_REASON_TYPE
_NAME
);
searchVo
.
setResultIdThree
(
RegistConstants
.
BASE_REASON_TYPE
);
}
}
listParamProject
.
add
(
searchVo
);
listParamProject
.
add
(
searchVo
);
}
}
...
@@ -1419,9 +1419,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1419,9 +1419,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave
.
setFailEmpProjectRemark
(
errorMessage
);
leave
.
setFailEmpProjectRemark
(
errorMessage
);
leave
.
setFailEmpProjectTime
(
LocalDateTime
.
now
());
leave
.
setFailEmpProjectTime
(
LocalDateTime
.
now
());
leave
.
setDoStatusProject
(
CommonConstants
.
NINE_STRING
);
leave
.
setDoStatusProject
(
CommonConstants
.
NINE_STRING
);
}
else
{
leave
.
setEmpProjectId
(
leave
.
getEmpProjectIdOld
());
leave
.
setDoStatusProject
(
CommonConstants
.
EIGHT_STRING
);
}
}
}
}
}
else
{
}
else
{
...
@@ -1457,9 +1454,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
...
@@ -1457,9 +1454,6 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave
.
setFailEmpRemark
(
errorMessage
);
leave
.
setFailEmpRemark
(
errorMessage
);
leave
.
setFailEmpTime
(
LocalDateTime
.
now
());
leave
.
setFailEmpTime
(
LocalDateTime
.
now
());
leave
.
setDoStatusEmp
(
CommonConstants
.
NINE_STRING
);
leave
.
setDoStatusEmp
(
CommonConstants
.
NINE_STRING
);
}
else
{
leave
.
setEmpId
(
leave
.
getEmpIdOld
());
leave
.
setDoStatusEmp
(
CommonConstants
.
EIGHT_STRING
);
}
}
}
}
}
else
{
}
else
{
...
...
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