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
cc09fef7
Commit
cc09fef7
authored
Oct 31, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
ae13e1c4
b4d33326
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+2
-1
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+1
-1
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+0
-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 @
cc09fef7
...
@@ -534,8 +534,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -534,8 +534,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
BeanUtils
.
copyProperties
(
newInfo
,
preVo
);
BeanUtils
.
copyProperties
(
newInfo
,
preVo
);
if
(
null
!=
preVo
.
getExitSocialInfoList
()
&&
!
preVo
.
getExitSocialInfoList
().
isEmpty
())
{
if
(
null
!=
preVo
.
getExitSocialInfoList
()
&&
!
preVo
.
getExitSocialInfoList
().
isEmpty
())
{
preVo
.
getExitSocialInfoList
().
forEach
(
socialPreDetailVo
->
socialPreDetailVo
.
setRegisterId
(
empPreId
));
preVo
.
getExitSocialInfoList
().
forEach
(
socialPreDetailVo
->
socialPreDetailVo
.
setRegisterId
(
empPreId
));
}
else
{
initSocialPreInfo
(
preVo
,
preVo
.
getDispatchInfoPreVo
(),
user
,
empPreId
);
}
}
initSocialPreInfo
(
preVo
,
preVo
.
getDispatchInfoPreVo
(),
user
,
empPreId
);
socialDaprUtils
.
saveSocialPreInfo
(
preVo
);
socialDaprUtils
.
saveSocialPreInfo
(
preVo
);
}
}
if
(!
saveOrUpdateList
.
isEmpty
())
{
if
(!
saveOrUpdateList
.
isEmpty
())
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
cc09fef7
...
@@ -415,6 +415,6 @@
...
@@ -415,6 +415,6 @@
a.expected_collection_time is not null
a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d")
<![CDATA[ <= ]]>
CURDATE()
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d")
<![CDATA[ <= ]]>
CURDATE()
and ((a.timeout_elec_sign = '0' and a.process_status = '0' and a.sign_type = '0') or
and ((a.timeout_elec_sign = '0' and a.process_status = '0' and a.sign_type = '0') or
a.process_status in ('1','3','5','7'))
a.process_status in ('1','3','5','7'
,'11'
))
</select>
</select>
</mapper>
</mapper>
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
cc09fef7
...
@@ -305,7 +305,6 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
...
@@ -305,7 +305,6 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
}
}
TDispatchInfoPre
preExit
=
baseMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
TDispatchInfoPre
preExit
=
baseMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
.
eq
(
TDispatchInfoPre:
:
getRegisterId
,
id
)
.
eq
(
TDispatchInfoPre:
:
getRegisterId
,
id
)
.
in
(
TDispatchInfoPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"2"
,
"4"
,
"8"
))
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
preExit
))
{
if
(
Common
.
isNotNull
(
preExit
))
{
TDispatchInfoPreVo
pre
=
new
TDispatchInfoPreVo
();
TDispatchInfoPreVo
pre
=
new
TDispatchInfoPreVo
();
...
...
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