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
acee5560
Commit
acee5560
authored
Nov 03, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
96308df7
20d4073c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+1
-1
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+5
-0
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
acee5560
...
@@ -851,7 +851,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -851,7 +851,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
try
{
try
{
// 查询符合条件的合同:状态为"签署中"(6) 且 为电子签任务(signType=0) 且 入职日期到当日正好一个月
// 查询符合条件的合同:状态为"签署中"(6) 且 为电子签任务(signType=0) 且 入职日期到当日正好一个月
LocalDate
currentDate
=
LocalDate
.
now
();
LocalDate
currentDate
=
LocalDate
.
now
();
LocalDate
oneMonthAgo
=
currentDate
.
minusMonths
(
1
);
LocalDate
oneMonthAgo
=
currentDate
.
minusMonths
(
1
)
.
plusDays
(
1
)
;
List
<
TEmployeeContractPre
>
contractsToRevoke
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
List
<
TEmployeeContractPre
>
contractsToRevoke
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
.
lambda
()
.
lambda
()
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
acee5560
...
@@ -455,6 +455,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -455,6 +455,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
simNew
.
put
(
"socialIsBuy"
,
isSocailBuyNew
);
simNew
.
put
(
"socialIsBuy"
,
isSocailBuyNew
);
this
.
setLogBaseInfo
(
empPreId
,
old
,
simNew
,
user
,
differenceSocialKey
,
logId
,
detailSocialLog
);
this
.
setLogBaseInfo
(
empPreId
,
old
,
simNew
,
user
,
differenceSocialKey
,
logId
,
detailSocialLog
);
detailList
.
add
(
detailSocialLog
);
detailList
.
add
(
detailSocialLog
);
if
(
Common
.
isNotNull
(
diffTitle
))
{
diffTitle
+=
"、社保信息"
;
}
else
{
diffTitle
=
"社保信息"
;
}
}
}
//查询老的社保明细
//查询老的社保明细
R
<
EmployeePreSocialListVo
>
socialSdr
=
socialDaprUtils
.
getSocialPreInfoList
(
empPreId
);
R
<
EmployeePreSocialListVo
>
socialSdr
=
socialDaprUtils
.
getSocialPreInfoList
(
empPreId
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
acee5560
...
@@ -300,7 +300,7 @@
...
@@ -300,7 +300,7 @@
<include
refid=
"tEmployeeContractPre_where"
/>
<include
refid=
"tEmployeeContractPre_where"
/>
</where>
</where>
order by a.create_time desc
order by a.create_time desc
limit 0,
2000
limit 0,
5
</select>
</select>
<!--tEmployeeContractPre导出查询-->
<!--tEmployeeContractPre导出查询-->
...
...
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