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
b04058e7
Commit
b04058e7
authored
Mar 01, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.1-收入证明等
parent
ab1c348b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
SalaryProveController.java
...us/v1/yifu/archives/controller/SalaryProveController.java
+6
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/SalaryProveController.java
View file @
b04058e7
...
...
@@ -160,7 +160,12 @@ public class SalaryProveController {
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
proveType
))
{
//正式员工证明
//合同信息
List
<
TEmployeeContractInfo
>
contractList
=
employeeContractInfoService
.
list
(
Wrappers
.<
TEmployeeContractInfo
>
lambdaQuery
().
eq
(
TEmployeeContractInfo:
:
getEmpId
,
emId
).
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
).
orderByDesc
(
TEmployeeContractInfo:
:
getContractStart
));
List
<
TEmployeeContractInfo
>
contractList
=
employeeContractInfoService
.
list
(
Wrappers
.<
TEmployeeContractInfo
>
lambdaQuery
()
.
eq
(
TEmployeeContractInfo:
:
getEmpId
,
em
.
getEmpId
())
.
eq
(
TEmployeeContractInfo:
:
getSettleDomain
,
em
.
getDeptId
())
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
isNotNull
(
TEmployeeContractInfo:
:
getAuditTimeLast
)
.
orderByDesc
(
TEmployeeContractInfo:
:
getContractStart
));
if
(
Common
.
isNotNull
(
contractList
))
{
record
.
setContractEndDate
(
contractList
.
get
(
0
).
getContractEnd
());
record
.
setContractType
(
contractList
.
get
(
0
).
getContractType
());
...
...
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