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
1a06498e
Commit
1a06498e
authored
Oct 24, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
5d30caf9
cd9e58c7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-0
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+3
-3
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
1a06498e
...
...
@@ -19,6 +19,7 @@ public class EmployeeConstants {
public
static
final
String
CONTACT_ADDRESS
=
"通信地址必填!"
;
public
static
final
String
EMP_NATRUE_ZERO
=
"派遣"
;
public
static
final
String
EMP_NATRUE_ONE
=
"外包"
;
public
static
final
String
EMP_NATRUE_THREE
=
"内部员工"
;
public
static
final
String
HIGN_EDUCATION
=
"最高学历必填"
;
public
static
final
String
SCHOOL
=
"学校必填"
;
public
static
final
String
MAJOR
=
"专业必填"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
1a06498e
...
...
@@ -238,8 +238,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
// 获取所有未审核通过的合同数据
List
<
TEmployeeContractInfo
>
notAccessList
=
contractInfoMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
.
and
(
obj
->
obj
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ZERO_STRING
)
.
or
().
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_STRING
)
.
or
().
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
THREE_STRING
))
.
or
().
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_STRING
))
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getWorkFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
));
...
...
@@ -294,7 +293,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
&&
project
.
getProjectStatus
().
intValue
()==
CommonConstants
.
ONE_INT
)
||
(
!
CommonConstants
.
ZERO_STRING
.
equals
(
project
.
getEmpNatrue
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
project
.
getEmpNatrue
()))
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
project
.
getEmpNatrue
())
&&
!
CommonConstants
.
THREE_STRING
.
equals
(
project
.
getEmpNatrue
()))
)){
return
;
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
1a06498e
...
...
@@ -794,7 +794,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"员工类型必填!"
));
}
else
if
(
EmployeeConstants
.
EMP_NATRUE_ZERO
.
equals
(
employeeInfo
.
getEmpNatrue
())
||
EmployeeConstants
.
EMP_NATRUE_ONE
.
equals
(
employeeInfo
.
getEmpNatrue
())
||
CommonConstants
.
THREE_STRING
.
equals
(
employeeInfo
.
getEmpNatrue
()))
{
||
EmployeeConstants
.
EMP_NATRUE_THREE
.
equals
(
employeeInfo
.
getEmpNatrue
()))
{
// 2.员工类型为外包和派遣和内部员工,额外必填项有:身份证开始日期、身份证截止日期、民族、户籍所在(省市县)、户口性质、档案所在地(省市县)、是否大专及以上、通信地址
if
(
Common
.
isEmpty
(
employeeInfo
.
getValidityStart
()))
{
errorMsg
.
add
(
EmployeeConstants
.
VALIDITY_START
);
...
...
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