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
d73818dd
Commit
d73818dd
authored
Oct 15, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提交
parent
0fec7a62
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
52 additions
and
33 deletions
+52
-33
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+4
-4
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+1
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+5
-5
ArchiveTask.java
.../java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java
+4
-4
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+4
-4
THolidayInfoServiceImpl.java
.../v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
+34
-15
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
d73818dd
...
...
@@ -211,12 +211,12 @@ public class TEmployeeContractPreController {
}
/**
* 派单当日
8点30分
统一推送确认信息
* 派单当日
9点
统一推送确认信息
* @author huych
* @date 2025-06-16 11:26:16
* @return void
*/
@SysLog
(
"派单当日
8点30分
统一推送确认信息"
)
@SysLog
(
"派单当日
9点
统一推送确认信息"
)
@Inner
@PostMapping
(
"/inner/pushWxConfrimMessage"
)
public
void
pushWxConfrimMessage
()
{
...
...
@@ -224,12 +224,12 @@ public class TEmployeeContractPreController {
}
/**
* 每天
上午9
点推送待派单数据
* 每天
15.00/15.20
点推送待派单数据
* @author huych
* @date 2025-06-16 14:18:26
* @return void
*/
@SysLog
(
"每天
上午9
点推送待派单数据"
)
@SysLog
(
"每天
15.00/15.20
点推送待派单数据"
)
@Inner
@PostMapping
(
"/inner/pushDisConfrimContracts"
)
public
void
pushDisConfrimContracts
()
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
d73818dd
...
...
@@ -371,7 +371,7 @@
<include
refid=
"Base_Column_List"
/>
FROM t_employee_contract_pre a
where a.process_status = '0' and a.expected_confirm_time is not null
and DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d")
=
CURDATE()
and DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d")
<![CDATA[ <= ]]>
CURDATE()
group by a.customer_user_loginname
</select>
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
d73818dd
...
...
@@ -1728,14 +1728,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo
.
setRegistDate
(
preVo
.
getJoinLeaveDate
());
Date
date
=
this
.
addYearsMonths
(
vo
);
TEmployeeInsuranceWorkDayVo
dayVo
=
new
TEmployeeInsuranceWorkDayVo
();
dayVo
.
setType
(
CommonConstants
.
T
HREE
_STRING
);
dayVo
.
setType
(
CommonConstants
.
T
WO
_STRING
);
dayVo
.
setRegistDate
(
date
);
dayVo
.
setRegistType
(
0
);
R
<
TEmployeeInsuranceWorkDayVo
>
dataR
=
socialDaprUtils
.
get
BeforeOr
AfterWorkDay
(
dayVo
);
R
<
TEmployeeInsuranceWorkDayVo
>
dataR
=
socialDaprUtils
.
get
Contract
AfterWorkDay
(
dayVo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Common
.
isNotNull
(
dataR
.
getData
())
&&
Common
.
isNotNull
(
dataR
.
getData
().
get
PriDis
Date
()))
{
preVo
.
setExpectedCollectionTime
(
dataR
.
getData
().
get
PriDis
Date
());
preVo
.
setExpectedConfirmTime
(
dataR
.
getData
().
get
PriDis
Date
());
&&
Common
.
isNotNull
(
dataR
.
getData
().
get
Regist
Date
()))
{
preVo
.
setExpectedCollectionTime
(
dataR
.
getData
().
get
Regist
Date
());
preVo
.
setExpectedConfirmTime
(
dataR
.
getData
().
get
Regist
Date
());
}
else
{
preVo
.
setExpectedCollectionTime
(
date
);
preVo
.
setExpectedConfirmTime
(
date
);
...
...
yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java
View file @
d73818dd
...
...
@@ -86,19 +86,19 @@ public class ArchiveTask {
}
public
void
pushWxContractConfrimMessage
()
{
log
.
info
(
"-------------每天
8.30
推送合同待签订信息------------"
);
log
.
info
(
"-------------每天
9点
推送合同待签订信息------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractpre/inner/pushWxConfrimMessage"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每天
8.30
推送合同待签订信息-定时任务开始------------"
);
log
.
info
(
"-------------每天
9点
推送合同待签订信息-定时任务开始------------"
);
}
public
void
pushDisConfrimContracts
()
{
log
.
info
(
"-------------每天
9
点推送合同待签订信息------------"
);
log
.
info
(
"-------------每天
15.00/15.20
点推送合同待签订信息------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractpre/inner/pushDisConfrimContracts"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每天
9
点推送合同待签订信息-定时任务开始------------"
);
log
.
info
(
"-------------每天
15.00/15.20
点推送合同待签订信息-定时任务开始------------"
);
}
public
void
everyDayCreateRiskMonitor
()
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
d73818dd
...
...
@@ -212,13 +212,13 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
vo
.
setRegistDate
(
preVo
.
getJoinLeaveDate
());
Date
date
=
this
.
addYearsMonths
(
vo
);
TEmployeeInsuranceWorkDayVo
dayVo
=
new
TEmployeeInsuranceWorkDayVo
();
dayVo
.
setType
(
CommonConstants
.
T
HREE
_STRING
);
dayVo
.
setType
(
CommonConstants
.
T
WO
_STRING
);
dayVo
.
setRegistDate
(
date
);
dayVo
.
setRegistType
(
0
);
TEmployeeInsuranceWorkDayVo
dataR
=
tHolidayInfoService
.
getInitBeforeOrAfterWorkDay
(
dayVo
);
TEmployeeInsuranceWorkDayVo
dataR
=
tHolidayInfoService
.
selectBeforeOrAfterWorkDayCommon
(
dayVo
);
if
(
Common
.
isNotNull
(
dataR
)
&&
Common
.
isNotNull
(
dataR
.
getPriDisDate
()))
{
preVo
.
setExpectedCollectionTime
(
dataR
.
get
PriDis
Date
());
preVo
.
setExpectedConfirmTime
(
dataR
.
get
PriDis
Date
());
preVo
.
setExpectedCollectionTime
(
dataR
.
get
Regist
Date
());
preVo
.
setExpectedConfirmTime
(
dataR
.
get
Regist
Date
());
}
else
{
preVo
.
setExpectedCollectionTime
(
date
);
preVo
.
setExpectedConfirmTime
(
date
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
View file @
d73818dd
...
...
@@ -321,21 +321,43 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
// 转回Date类型
vo
.
setRegistDate
(
Date
.
from
(
localDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
()));
//判断传入日期是否大于今天
//查找入职日期的后一个工作日
getWorkDay
(
holidayMap
,
vo
);
//判断后一个工作日是否大于今天
LocalDate
givenLocalDate
=
vo
.
getRegistDate
().
toInstant
()
.
atZone
(
java
.
time
.
ZoneId
.
systemDefault
())
.
toLocalDate
();
// 获取今天的 LocalDate
LocalDate
today
=
LocalDate
.
now
();
// 判断给定日期是否小于今天,日期小于今天则返回今天
LocalTime
currentTime
=
LocalTime
.
now
();
if
(
givenLocalDate
.
isBefore
(
today
)
||
givenLocalDate
.
isEqual
(
today
))
{
//判断是否是工作日
// 如果日期后一个工作日日期小于等于今天
if
(
currentTime
.
isBefore
(
LocalTime
.
of
(
15
,
20
))
||
currentTime
.
equals
(
LocalTime
.
of
(
15
,
20
)))
{
// 如果当前时间在15:20之前
//判断当前时间是否为非工作日,如果是的话,预派时间需要为下个工作日
if
(
null
!=
holidayMap
.
get
(
LocalDateTimeUtils
.
convertLDToDate
(
today
)))
{
TEmployeeInsuranceWorkDayVo
newVoUnWork
=
new
TEmployeeInsuranceWorkDayVo
();
newVoUnWork
.
setRegistDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
));
newVoUnWork
.
setType
(
CommonConstants
.
TWO_STRING
);
getWorkDay
(
holidayMap
,
newVoUnWork
);
vo
.
setRegistDate
(
newVoUnWork
.
getRegistDate
());
}
else
{
vo
.
setRegistDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
));
}
if
(
Boolean
.
TRUE
.
equals
(
checkIsWorkDay
(
vo
))){
//非工作日找下一个工作日
getWorkDay
(
holidayMap
,
vo
);
return
vo
;
}
else
{
// 如果当前时间在15:20之后
TEmployeeInsuranceWorkDayVo
afterVo
=
new
TEmployeeInsuranceWorkDayVo
();
afterVo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
),
CommonConstants
.
ONE_INT
));
afterVo
.
setType
(
CommonConstants
.
TWO_STRING
);
getWorkDay
(
holidayMap
,
afterVo
);
vo
.
setRegistDate
(
afterVo
.
getRegistDate
());
}
}
else
{
//如果后一个工作日日期大于今天
//预计派单日期
vo
.
setRegistDate
(
vo
.
getRegistDate
());
}
return
vo
;
}
...
...
@@ -359,13 +381,10 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
.
atZone
(
java
.
time
.
ZoneId
.
systemDefault
())
.
toLocalDate
();
//查找入职日期的前一个
/后一个
工作日
//查找入职日期的前一个工作日
TEmployeeInsuranceWorkDayVo
newVo
=
new
TEmployeeInsuranceWorkDayVo
();
newVo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getRegistDate
(),
null
!=
vo
.
getType
()
&&
CommonConstants
.
THREE_STRING
.
equals
(
vo
.
getType
())
?
CommonConstants
.
ZERO_INT
:
CommonConstants
.
ONE_INT_NEGATE
));
newVo
.
setType
(
null
!=
vo
.
getType
()
&&
CommonConstants
.
THREE_STRING
.
equals
(
vo
.
getType
())
?
CommonConstants
.
TWO_STRING
:
CommonConstants
.
ONE_STRING
);
newVo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getRegistDate
(),
CommonConstants
.
ONE_INT_NEGATE
));
newVo
.
setType
(
CommonConstants
.
ONE_STRING
);
getWorkDay
(
holidayMap
,
newVo
);
//判断前一个工作日是否大于今天
...
...
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