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
c1de183c
Commit
c1de183c
authored
Oct 29, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提交
parent
e55822c9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
7 deletions
+18
-7
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+1
-1
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+17
-6
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
c1de183c
...
...
@@ -318,7 +318,7 @@ public class TEmployeeContractPreController {
/**
* 一键催办
* @param id
List
一键催办列表
* @param id 一键催办列表
**/
@Operation
(
description
=
"一键催办"
)
@PostMapping
(
"/contractUrg"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
c1de183c
...
...
@@ -36,6 +36,7 @@ import javax.servlet.ServletOutputStream;
import
javax.servlet.http.HttpServletResponse
;
import
java.net.URLEncoder
;
import
java.time.LocalDate
;
import
java.time.ZoneId
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
...
...
@@ -343,10 +344,13 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
});
customerStats
.
setInitiatedCount
(
customerStats
.
getInitiatedCount
()
+
1
);
LocalDate
joinDate
=
LocalDateTimeUtils
.
convertDateToLDT
(
contractPre
.
getJoinLeaveDate
()).
toLocalDate
();
LocalDate
localDate
=
contractPre
.
getJoinLeaveDate
().
toInstant
()
.
atZone
(
ZoneId
.
systemDefault
())
.
toLocalDate
();
localDate
=
localDate
.
plusMonths
(
1
)
.
minusDays
(
1
);
// 判断是否超过入职日期一个月
if
(
currentDate
.
isAfter
(
joinDate
.
plusMonths
(
1
)
))
{
if
(
currentDate
.
isAfter
(
localDate
))
{
// 超过一个月,算电子签发起失败
customerStats
.
setFailedCount
(
customerStats
.
getFailedCount
()
+
1
);
customerStats
.
setElectronicSignFailedCount
(
customerStats
.
getElectronicSignFailedCount
()
+
1
);
...
...
@@ -356,6 +360,10 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FIVE_STRING
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
"电子签发起失败:已超过入职日期一个月"
)
.
set
(
TEmployeeContractPre:
:
getChangeTypeUser
,
type
.
equals
(
"1"
)
?
"自动化手动—"
+
contractPre
.
getCustomerUsername
()
:
"自动化自动—"
+
contractPre
.
getCustomerUsername
()
)
.
set
(
TEmployeeContractPre:
:
getChangeTypeReason
,
"已超过入职日期一个月,自动转线下签"
)
.
set
(
TEmployeeContractPre:
:
getChangeTypeTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()))
.
set
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()));
this
.
update
(
updateWrapper
);
...
...
@@ -1050,11 +1058,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
for
(
TEmployeeContractPre
contract
:
signingContracts
)
{
if
(
contract
.
getJoinLeaveDate
()
!=
null
)
{
// 计算入职一个月的最后一天
LocalDate
joinDate
=
LocalDateTimeUtils
.
convertDateToLDT
(
contract
.
getJoinLeaveDate
()).
toLocalDate
();
LocalDate
lastDayOfMonth
=
joinDate
.
plusMonths
(
1
);
LocalDate
localDate
=
contract
.
getJoinLeaveDate
().
toInstant
()
.
atZone
(
ZoneId
.
systemDefault
())
.
toLocalDate
();
localDate
=
localDate
.
plusMonths
(
1
)
.
minusDays
(
1
);
// 计算往前3个工作日
List
<
LocalDate
>
reminderDates
=
calculateReminderWorkDays
(
l
astDayOfMonth
);
List
<
LocalDate
>
reminderDates
=
calculateReminderWorkDays
(
l
ocalDate
);
// 判断今天是否是提醒日期之一
if
(
reminderDates
.
contains
(
today
))
{
...
...
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