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
acdbd36c
Commit
acdbd36c
authored
Mar 01, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1
parents
fd7bfa38
22761e50
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
TProveRecord.java
...yifu/cloud/plus/v1/yifu/archives/entity/TProveRecord.java
+2
-2
SalaryProveController.java
...us/v1/yifu/archives/controller/SalaryProveController.java
+2
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TProveRecord.java
View file @
acdbd36c
...
...
@@ -185,14 +185,14 @@ public class TProveRecord extends Model<TProveRecord> {
*
*/
@NotBlank
(
message
=
"单位全称不能为空"
)
@Length
(
max
=
20
,
message
=
"不能超过2
0个字符"
)
@Length
(
max
=
100
,
message
=
"不能超过10
0个字符"
)
@Schema
(
description
=
"单位全称"
,
name
=
"unitName"
)
private
String
unitName
;
/**
*
*/
@NotBlank
(
message
=
"单位地址不能为空"
)
@Length
(
max
=
50
,
message
=
"不能超过5
0个字符"
)
@Length
(
max
=
100
,
message
=
"不能超过10
0个字符"
)
@Schema
(
description
=
"单位地址"
,
name
=
"unitAddr"
)
private
String
unitAddr
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/SalaryProveController.java
View file @
acdbd36c
...
...
@@ -162,9 +162,9 @@ public class SalaryProveController {
//正式员工证明
//合同信息
List
<
TEmployeeContractInfo
>
contractList
=
employeeContractInfoService
.
list
(
Wrappers
.<
TEmployeeContractInfo
>
lambdaQuery
()
.
eq
(
TEmployeeContractInfo:
:
getEmpId
,
em
.
getEmpI
d
())
.
eq
(
TEmployeeContractInfo:
:
getEmpId
card
,
em
.
getEmpIdcar
d
())
.
eq
(
TEmployeeContractInfo:
:
getSettleDomain
,
em
.
getDeptId
())
.
eq
(
TEmployeeContractInfo:
:
getI
sObsolet
e
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getI
nUs
e
,
CommonConstants
.
ZERO_STRING
)
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
ArchivesConstants
.
contractSituation
[
0
])
.
ne
(
TEmployeeContractInfo:
:
getSituation
,
ArchivesConstants
.
contractSituation
[
6
])
.
isNotNull
(
TEmployeeContractInfo:
:
getAuditTimeLast
)
...
...
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