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
973f3012
Commit
973f3012
authored
Oct 30, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
0ff3bd91
26dd64cc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+4
-0
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+1
-1
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+2
-1
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
973f3012
...
...
@@ -416,6 +416,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
//1.9.11 huych 附件类型不比较差异
contractOld
.
setAttaList
(
null
);
employeeContractPre
.
setAttaList
(
null
);
//如果电子签签署失败要变更成待发起
if
(
contractOld
.
getProcessStatus
().
equals
(
CommonConstants
.
SEVEN_STRING
))
{
employeeContractPre
.
setProcessStatus
(
CommonConstants
.
ONE_STRING
);
}
differenceContractKey
=
HrEquator
.
comparisonValueIgnoreField
(
contractOld
,
employeeContractPre
,
CONTRACT_IGNORE_FIELD
);
if
(
differenceContractKey
.
length
()
>
0
)
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
973f3012
...
...
@@ -253,7 +253,7 @@
1=1
<include
refid=
"employeeRegistration_where"
/>
</where>
limit 0,
2000
limit 0,
3
</select>
<!--employeeRegistration简单分页查询-->
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
973f3012
...
...
@@ -385,7 +385,8 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
dispatchInfoService
.
importTDispatchInfo
(
disList
,
errorMessageList
,
user
,
null
,
new
HashMap
<>());
if
(!
errorMessageList
.
stream
().
allMatch
(
message
->
message
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
)))
{
errorMessageListAll
.
addAll
(
errorMessageList
);
List
<
ErrorMessage
>
relErrorMessageList
=
errorMessageList
.
stream
().
filter
(
message
->
!
message
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
)).
collect
(
Collectors
.
toList
());
errorMessageListAll
.
addAll
(
relErrorMessageList
);
//更新社保状态为2发起失败
for
(
ErrorMessage
errorMessage
:
errorMessageList
)
{
if
(!
errorMessage
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
))
{
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
973f3012
...
...
@@ -414,7 +414,7 @@
<include
refid=
"tDispatchInfoPre_other_where"
/>
</where>
order by a.create_time desc
limit 0,
2000
limit 0,
3
</select>
<!--tDispatchInfoPre社保待派单数据查询-->
...
...
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