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
b37d8f4f
Commit
b37d8f4f
authored
Nov 26, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.17-离职待办-优化代码
parent
e85346a7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
17 deletions
+13
-17
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+0
-2
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+13
-15
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
b37d8f4f
...
@@ -2528,8 +2528,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -2528,8 +2528,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
private
YifuUser
getNewYifuUser
(
String
leaveName
)
{
private
YifuUser
getNewYifuUser
(
String
leaveName
)
{
if
(
Common
.
isEmpty
(
leaveName
))
{
if
(
Common
.
isEmpty
(
leaveName
))
{
leaveName
=
"自动化派单"
;
leaveName
=
"自动化派单"
;
}
else
{
leaveName
=
"自动化派单-"
+
leaveName
;
}
}
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
b37d8f4f
...
@@ -4731,13 +4731,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4731,13 +4731,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp
.
append
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
temp
.
append
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
initAuditInfo
(
auditInfo
,
temp
.
toString
(),
CommonConstants
.
THREE_STRING
,
user
,
temp
.
toString
(),
remark
);
initAuditInfo
(
auditInfo
,
temp
.
toString
(),
CommonConstants
.
THREE_STRING
,
user
,
temp
.
toString
(),
remark
);
// 派减审核或办理,更新离职待办
if
(
Common
.
isNotNull
(
socialInfo
.
getHandleStatus
())
&&
CommonConstants
.
SEVEN_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
SIX_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
}
else
{
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
ONE_STRING
,
handleRemark
,
user
);
}
}
else
{
}
else
{
temp
.
setLength
(
CommonConstants
.
ZERO_INT
);
temp
.
setLength
(
CommonConstants
.
ZERO_INT
);
temp
.
append
(
DispatchConstants
.
DISPATCH_SOCIAL_REDUCE
);
temp
.
append
(
DispatchConstants
.
DISPATCH_SOCIAL_REDUCE
);
...
@@ -4745,18 +4739,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4745,18 +4739,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp
.
append
(
DispatchConstants
.
DISPATCH_HANDLE_FAIL
);
temp
.
append
(
DispatchConstants
.
DISPATCH_HANDLE_FAIL
);
temp
.
append
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
temp
.
append
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
initAuditInfo
(
auditInfo
,
temp
.
toString
(),
CommonConstants
.
FOUR_STRING
,
user
,
temp
.
toString
(),
remark
);
initAuditInfo
(
auditInfo
,
temp
.
toString
(),
CommonConstants
.
FOUR_STRING
,
user
,
temp
.
toString
(),
remark
);
}
auditInfo
.
setSocialId
(
dis
.
getId
());
// 派减审核或办理,更新离职待办
// 派减审核或办理,更新离职待办
// 7 派减部分办理失败
if
(
Common
.
isNotNull
(
socialInfo
.
getHandleStatus
()))
{
if
(
Common
.
isNotNull
(
socialInfo
.
getHandleStatus
())
&&
CommonConstants
.
SEVEN_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
if
(
CommonConstants
.
SEVEN_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
SIX_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
SIX_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
}
else
{
}
else
if
(
CommonConstants
.
SIX_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
NINE_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
// 派减办理中 - 后续改造这里和离职待办的导出
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
FIVE_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
ONE_STRING
,
handleRemark
,
user
);
}
}
}
}
auditInfo
.
setSocialId
(
dis
.
getId
());
}
else
{
}
else
{
errorList
.
add
(
new
ErrorMessage
(-
1
,
"找不到对应员工社保数据:"
+
dis
.
getEmpName
()));
errorList
.
add
(
new
ErrorMessage
(-
1
,
"找不到对应员工社保数据:"
+
dis
.
getEmpName
()));
...
...
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