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
1e335b17
Commit
1e335b17
authored
Jul 23, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.7-预入职档案
parent
e1472d03
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
7 deletions
+13
-7
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+13
-7
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
1e335b17
...
...
@@ -1141,7 +1141,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
}
catch
(
Exception
e
)
{
log
.
error
(
"档案预入职C端保存异常:"
,
e
);
throw
new
RuntimeException
(
"保存失败,请联系管理员!!
主键【"
+
main
.
getId
()
+
"】详细信息:"
+
e
.
getMessage
()
);
throw
new
RuntimeException
(
"保存失败,请联系管理员!!
预入职主键【"
+
main
.
getId
()
+
"】"
);
}
}
...
...
@@ -1682,13 +1682,19 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
String
empCode
=
emp
.
getEmpCode
();
BeanUtil
.
copyProperties
(
tPreEmployeeInfo
,
emp
,
ID
);
/*
if (Common.isEmpty(emp.getEmpCode()) && Common.isNotNull(empCode)) {
if
(
Common
.
isEmpty
(
emp
.
getEmpCode
())
&&
Common
.
isNotNull
(
empCode
))
{
emp
.
setEmpCode
(
empCode
);
}*/
}
if
(
Common
.
isEmpty
(
emp
.
getEmpCode
()))
{
emp
.
setEmpCode
(
tEmployeeInfoService
.
getCode
());
}
emp
.
setFileStatus
(
CommonConstants
.
ZERO_INT
);
emp
.
setDeleteFlag
(
CommonConstants
.
STATUS_NORMAL
);
if
(
isNew
)
{
// 新员工塞基本属性
this
.
setNewEmpBaseData
(
emp
,
user
);
}
emp
.
setFileStatus
(
CommonConstants
.
ZERO_INT
);
tEmployeeInfoService
.
saveOrUpdate
(
emp
);
return
emp
;
}
...
...
@@ -2036,10 +2042,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return
R
.
failed
(
"id、status不可为空!"
);
}
TPreEmpMain
preEmpMain
=
this
.
getById
(
id
);
try
{
if
(
preEmpMain
==
null
||
Common
.
isEmpty
(
preEmpMain
.
getStatus
())
||
!
CommonConstants
.
TWO_STRING
.
equals
(
preEmpMain
.
getStatus
()))
{
return
R
.
failed
(
"请确认ID与状态!"
);
}
try
{
if
(!
CommonConstants
.
THREE_STRING
.
equals
(
status
)
&&
!
CommonConstants
.
FOUR_STRING
.
equals
(
status
))
{
return
R
.
failed
(
"审核状态不对!"
);
}
...
...
@@ -2083,7 +2089,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
}
catch
(
Exception
e
)
{
log
.
error
(
"档案预入职审核异常:"
,
e
);
throw
new
RuntimeException
(
"保存失败,请联系管理员!!
主键【"
+
preEmpMain
.
getId
()
+
"】详细信息:"
+
e
.
getMessage
()
);
throw
new
RuntimeException
(
"保存失败,请联系管理员!!
预入职主键【"
+
preEmpMain
.
getId
()
+
"】"
);
}
}
...
...
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