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
11f5eb1c
Commit
11f5eb1c
authored
Jul 11, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-预入职相关_导出优化
parent
84f07841
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+6
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
11f5eb1c
...
...
@@ -48,6 +48,7 @@ import org.apache.commons.compress.utils.Lists;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.authority.AuthorityUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -807,6 +808,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
* @Date: 2024/6/17 17:44
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Transactional
private
R
<
String
>
saveBase
(
PreEmpMainDetailVo
vo
,
String
status
)
{
YifuUser
user
=
getNewYifuUser
();
TPreEmpMain
main
=
vo
.
getMain
();
...
...
@@ -1280,7 +1282,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List
<
TPreEmpProfessionalQualification
>
tPreEmpProfessionalQualificationList
=
vo
.
getTpreEmpProfessionalQualificationList
();
// 先删除其他信息
tEmpProfessionalService
.
deleteProfessionalByEmpId
(
empId
);
if
(
tPreEmpProfessionalQualificationList
!=
null
)
{
if
(
tPreEmpProfessionalQualificationList
!=
null
&&
(
Common
.
isEmpty
(
emp
.
getHaveQualification
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
emp
.
getHaveQualification
())))
{
TEmpProfessionalQualification
info
;
for
(
TPreEmpProfessionalQualification
preInfo
:
tPreEmpProfessionalQualificationList
)
{
info
=
new
TEmpProfessionalQualification
();
...
...
@@ -1326,7 +1329,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List
<
TPreEmpWorkRecording
>
tPreEmpWorkRecordingList
=
vo
.
getTpreEmpWorkRecordingList
();
// 先删除其他信息
tEmpWorkRecordingService
.
deleteWorkRecordByEmpId
(
empId
);
if
(
tPreEmpWorkRecordingList
!=
null
)
{
if
(
tPreEmpWorkRecordingList
!=
null
&&
(
Common
.
isEmpty
(
emp
.
getFirstWorkFlag
())
||
CommonConstants
.
ONE_STRING
.
equals
(
emp
.
getFirstWorkFlag
()))
)
{
TEmpWorkRecording
info
;
for
(
TPreEmpWorkRecording
preInfo
:
tPreEmpWorkRecordingList
)
{
info
=
new
TEmpWorkRecording
();
...
...
@@ -1766,6 +1769,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
@Override
@Transactional
public
R
<
String
>
doAudit
(
String
id
,
String
status
,
String
auditRemark
)
{
if
(
Common
.
isEmpty
(
id
)
&&
Common
.
isEmpty
(
status
))
{
return
R
.
failed
(
"id、status不可为空!"
);
...
...
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